Code Cleanup pt 3

src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java

@@ -11,57 +11,46 @@ import org.bukkit.block.Block;
 public class NullChunkletManager implements ChunkletManager {
     @Override
     public void loadChunklet(int cx, int cy, int cz, World world) {
-        return;
     }
 
     @Override
     public void unloadChunklet(int cx, int cy, int cz, World world) {
-        return;
     }
 
     @Override
     public void loadChunk(int cx, int cz, World world) {
-        return;
     }
 
     @Override
     public void unloadChunk(int cx, int cz, World world) {
-        return;
     }
 
     @Override
     public void chunkLoaded(int cx, int cz, World world) {
-        return;
     }
 
     @Override
     public void chunkUnloaded(int cx, int cz, World world) {
-        return;
     }
 
     @Override
     public void saveWorld(World world) {
-        return;
     }
 
     @Override
     public void unloadWorld(World world) {
-        return;
     }
 
     @Override
     public void loadWorld(World world) {
-        return;
     }
 
     @Override
     public void saveAll() {
-        return;
     }
 
     @Override
     public void unloadAll() {
-        return;
     }
 
     @Override
@@ -76,26 +65,21 @@ public class NullChunkletManager implements ChunkletManager {
 
     @Override
     public void setTrue(int x, int y, int z, World world) {
-        return;
     }
 
     @Override
     public void setTrue(Block block) {
-        return;
     }
 
     @Override
     public void setFalse(int x, int y, int z, World world) {
-        return;
     }
 
     @Override
     public void setFalse(Block block) {
-        return;
     }
 
     @Override
     public void cleanUp() {
-        return;
     }
 }

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

@@ -154,11 +154,8 @@ public class HashChunkManager implements ChunkManager {
     public synchronized void unloadChunk(int cx, int cz, World world) {
         saveChunk(cx, cz, world);
 
-        if (store.containsKey(world.getName() + "," + cx + "," + cz)) {
-            store.remove(world.getName() + "," + cx + "," + cz);
-
-            //closeChunkStore(world, cx, cz);
-        }
+        //closeChunkStore(world, cx, cz);
+        store.remove(world.getName() + "," + cx + "," + cz);
     }
 
     @Override

src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java

@@ -147,15 +147,15 @@ public class McMMOSimpleRegionFile {
         return file;
     }
 
-    public synchronized boolean testCloseTimeout() {
-        /*
+/*    public synchronized boolean testCloseTimeout() {
+        *//*
         if (System.currentTimeMillis() - TIMEOUT_TIME > lastAccessTime) {
             close();
             return true;
         }
-         */
+         *//*
         return false;
-    }
+    }*/
 
     public synchronized DataOutputStream getOutputStream(int x, int z) {
         int index = getChunkIndex(x, z);

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

@@ -13,7 +13,7 @@ public class NullChunkManager implements ChunkManager {
     public void closeAll() {}
 
     @Override
-    public ChunkStore readChunkStore(World world, int x, int z) throws IOException {
+    public ChunkStore readChunkStore(World world, int x, int z) {
         return null;
     }
 

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

@@ -28,7 +28,6 @@ public class BlockStoreConversionMain implements Runnable {
         }
 
         this.taskID = this.scheduler.runTaskLater(mcMMO.p, this, 1).getTaskId();
-        return;
     }
 
     @Override
@@ -87,6 +86,5 @@ public class BlockStoreConversionMain implements Runnable {
         this.world = null;
         this.scheduler = null;
         this.converters = null;
-        return;
     }
 }

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

@@ -29,7 +29,6 @@ public class BlockStoreConversionXDirectory implements Runnable {
         }
 
         this.taskID = this.scheduler.runTaskLater(mcMMO.p, this, 1).getTaskId();
-        return;
     }
 
     @Override

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

@@ -41,7 +41,6 @@ public class BlockStoreConversionZDirectory implements Runnable {
         }
 
         this.taskID = this.scheduler.runTaskLater(mcMMO.p, this, 1).getTaskId();
-        return;
     }
 
     @Override