Fixing a permissions loop and reverting a package change to prevent Serialization errors.

src/main/java/com/gmail/nossr50/listeners/WorldListener.java

@@ -20,7 +20,7 @@ import org.bukkit.event.world.WorldInitEvent;
 import org.bukkit.event.world.WorldUnloadEvent;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.blockstore.conversion.BlockStoreConversionMain;
+import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionMain;
 
 public class WorldListener implements Listener {
     private ArrayList<BlockStoreConversionMain> converters = new ArrayList<BlockStoreConversionMain>();

src/main/java/com/gmail/nossr50/mcMMO.java

@@ -16,8 +16,8 @@ import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitScheduler;
 
-import com.gmail.nossr50.blockstore.chunkmeta.ChunkManager;
-import com.gmail.nossr50.blockstore.chunkmeta.ChunkManagerFactory;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManager;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.ChunkManagerFactory;
 import com.gmail.nossr50.commands.general.AddlevelsCommand;
 import com.gmail.nossr50.commands.general.AddxpCommand;
 import com.gmail.nossr50.commands.general.InspectCommand;

src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManager.java → src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 import org.bukkit.World;
 import org.bukkit.block.Block;

src/main/java/com/gmail/nossr50/blockstore/old/ChunkletManagerFactory.java → src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 import com.gmail.nossr50.config.HiddenConfig;
 

src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStore.java → src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 import java.io.Serializable;
 

src/main/java/com/gmail/nossr50/blockstore/old/ChunkletStoreFactory.java → src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 public class ChunkletStoreFactory {
     protected static ChunkletStore getChunkletStore() {

src/main/java/com/gmail/nossr50/blockstore/old/HashChunkletManager.java → src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 import java.io.EOFException;
 import java.io.File;

src/main/java/com/gmail/nossr50/blockstore/old/NullChunkletManager.java → src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 import org.bukkit.World;
 import org.bukkit.block.Block;

src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveChunkletStore.java → src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 public class PrimitiveChunkletStore implements ChunkletStore {
     private static final long serialVersionUID = -3453078050608607478L;

src/main/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStore.java → src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 import java.io.Externalizable;
 import java.io.IOException;

src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManager.java → src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.chunkmeta;
+package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
 import java.io.IOException;
 

src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkManagerFactory.java → src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.chunkmeta;
+package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
 import com.gmail.nossr50.config.HiddenConfig;
 

src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStore.java → src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java

@@ -1,10 +1,10 @@
-package com.gmail.nossr50.blockstore.chunkmeta;
+package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
 import java.io.Serializable;
 import java.util.List;
 import java.util.UUID;
 
-import com.gmail.nossr50.blockstore.old.ChunkletStore;
+import com.gmail.nossr50.util.blockmeta.ChunkletStore;
 
 /**
  * A ChunkStore should be responsible for a 16x16xWorldHeight area of data

src/main/java/com/gmail/nossr50/blockstore/chunkmeta/ChunkStoreFactory.java → src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.chunkmeta;
+package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
 import org.bukkit.World;
 

src/main/java/com/gmail/nossr50/blockstore/chunkmeta/HashChunkManager.java → src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.chunkmeta;
+package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
 import java.io.File;
 import java.io.IOException;
@@ -18,7 +18,7 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.Entity;
 import org.getspout.spoutapi.chunkstore.mcMMOSimpleRegionFile;
 
-import com.gmail.nossr50.blockstore.conversion.BlockStoreConversionZDirectory;
+import com.gmail.nossr50.util.blockmeta.conversion.BlockStoreConversionZDirectory;
 
 public class HashChunkManager implements ChunkManager {
     private HashMap<UUID, HashMap<Long, mcMMOSimpleRegionFile>> regionFiles = new HashMap<UUID, HashMap<Long, mcMMOSimpleRegionFile>>();

src/main/java/com/gmail/nossr50/blockstore/chunkmeta/NullChunkManager.java → src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.chunkmeta;
+package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
 import java.io.IOException;
 

src/main/java/com/gmail/nossr50/blockstore/chunkmeta/PrimitiveChunkStore.java → src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.chunkmeta;
+package com.gmail.nossr50.util.blockmeta.chunkmeta;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;
@@ -10,7 +10,7 @@ import java.util.UUID;
 import org.bukkit.World;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.blockstore.old.ChunkletStore;
+import com.gmail.nossr50.util.blockmeta.ChunkletStore;
 
 public class PrimitiveChunkStore implements ChunkStore {
     private static final long serialVersionUID = -1L;

src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionMain.java → src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.conversion;
+package com.gmail.nossr50.util.blockmeta.conversion;
 
 import java.io.File;
 

src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionXDirectory.java → src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java

@@ -1,4 +1,4 @@
-package com.gmail.nossr50.blockstore.conversion;
+package com.gmail.nossr50.util.blockmeta.conversion;
 
 import java.io.File;
 

src/main/java/com/gmail/nossr50/blockstore/conversion/BlockStoreConversionZDirectory.java → src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java

@@ -1,16 +1,16 @@
-package com.gmail.nossr50.blockstore.conversion;
+package com.gmail.nossr50.util.blockmeta.conversion;
 
 import java.io.File;
 
 import org.bukkit.scheduler.BukkitScheduler;
 
 import com.gmail.nossr50.mcMMO;
-import com.gmail.nossr50.blockstore.chunkmeta.HashChunkManager;
-import com.gmail.nossr50.blockstore.chunkmeta.PrimitiveChunkStore;
-import com.gmail.nossr50.blockstore.old.ChunkletStore;
-import com.gmail.nossr50.blockstore.old.HashChunkletManager;
-import com.gmail.nossr50.blockstore.old.PrimitiveChunkletStore;
-import com.gmail.nossr50.blockstore.old.PrimitiveExChunkletStore;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.HashChunkManager;
+import com.gmail.nossr50.util.blockmeta.chunkmeta.PrimitiveChunkStore;
+import com.gmail.nossr50.util.blockmeta.ChunkletStore;
+import com.gmail.nossr50.util.blockmeta.HashChunkletManager;
+import com.gmail.nossr50.util.blockmeta.PrimitiveChunkletStore;
+import com.gmail.nossr50.util.blockmeta.PrimitiveExChunkletStore;
 
 public class BlockStoreConversionZDirectory implements Runnable {
     public int taskID, cx, cz, x, y, z, y2, xPos, zPos, cxPos, czPos;

src/main/resources/plugin.yml

@@ -157,7 +157,6 @@ permissions:
         description: mcmmo permissions that default to op
         children:
             mcmmo.chat.adminchat: true
-            mcmmo.admin: true
             mcmmo.tools.all: true
     mcmmo.admin:
         default: false

src/test/java/com/gmail/nossr50/blockstore/old/PrimitiveExChunkletStoreTest.java

@@ -1,11 +1,11 @@
-package com.gmail.nossr50.blockstore.old;
+package com.gmail.nossr50.util.blockmeta;
 
 import static org.junit.Assert.assertEquals;
 
 import org.junit.Before;
 import org.junit.Test;
 
-import com.gmail.nossr50.blockstore.old.PrimitiveExChunkletStore;
+import com.gmail.nossr50.util.blockmeta.PrimitiveExChunkletStore;
 
 public class PrimitiveExChunkletStoreTest {
     byte addresses[][] = new byte[16][16];