Override cleanup methods in BlockCache implementations to remove world

references.
NoCheatPlus · Mar 13, 2013 · f2ab4c9 · f2ab4c9
1 parent 5197dbd
commit f2ab4c9
Show file tree

Hide file tree

Showing 6 changed files with 54 additions and 0 deletions.
diff --git a/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/BlockCacheBukkit.java b/NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/compat/bukkit/BlockCacheBukkit.java
@@ -62,5 +62,14 @@ public boolean standsOnEntity(final Entity entity, final double minX, final doub
 		}
 		return false;
 	}
+
+	/* (non-Javadoc)
+	 * @see fr.neatmonster.nocheatplus.utilities.BlockCache#cleanup()
+	 */
+	@Override
+	public void cleanup() {
+		super.cleanup();
+		world = null;
+	}
 
 }
diff --git a/NCPCompatCB2511/src/main/java/fr/neatmonster/nocheatplus/compat/cb2511/BlockCacheCB2511.java b/NCPCompatCB2511/src/main/java/fr/neatmonster/nocheatplus/compat/cb2511/BlockCacheCB2511.java
@@ -85,6 +85,15 @@ public boolean standsOnEntity(Entity entity, final double minX, final double min
 		return false;
 	}
 
+	/* (non-Javadoc)
+	 * @see fr.neatmonster.nocheatplus.utilities.BlockCache#cleanup()
+	 */
+	@Override
+	public void cleanup() {
+		super.cleanup();
+		world = null;
+	}
+
 	@Override
 	public Material getMaterial(final int x, final int y, final int z) {
 		return world.getMaterial(x, y, z);

diff --git a/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheCB2512.java b/NCPCompatCB2512/src/main/java/fr/neatmonster/nocheatplus/compat/cb2512/BlockCacheCB2512.java
@@ -84,6 +84,15 @@ public boolean standsOnEntity(final Entity entity, final double minX, final doub
 		}
 		return false;
 	}
+
+	/* (non-Javadoc)
+	 * @see fr.neatmonster.nocheatplus.utilities.BlockCache#cleanup()
+	 */
+	@Override
+	public void cleanup() {
+		super.cleanup();
+		world = null;
+	}
 
 	@Override
 	public Material getMaterial(final int x, final int y, final int z) {

diff --git a/NCPCompatCB2545/src/main/java/fr/neatmonster/nocheatplus/compat/cb2545/BlockCacheCB2545.java b/NCPCompatCB2545/src/main/java/fr/neatmonster/nocheatplus/compat/cb2545/BlockCacheCB2545.java
@@ -84,6 +84,15 @@ public boolean standsOnEntity(final Entity entity, final double minX, final doub
 		}
 		return false;
 	}
+
+	/* (non-Javadoc)
+	 * @see fr.neatmonster.nocheatplus.utilities.BlockCache#cleanup()
+	 */
+	@Override
+	public void cleanup() {
+		super.cleanup();
+		world = null;
+	}
 
 	@Override
 	public Material getMaterial(final int x, final int y, final int z) {

diff --git a/NCPCompatCB2602/src/main/java/fr/neatmonster/nocheatplus/compat/cb2602/BlockCacheCB2602.java b/NCPCompatCB2602/src/main/java/fr/neatmonster/nocheatplus/compat/cb2602/BlockCacheCB2602.java
@@ -85,6 +85,15 @@ public boolean standsOnEntity(final Entity entity, final double minX, final doub
 		}
 		return false;
 	}
+
+	/* (non-Javadoc)
+	 * @see fr.neatmonster.nocheatplus.utilities.BlockCache#cleanup()
+	 */
+	@Override
+	public void cleanup() {
+		super.cleanup();
+		world = null;
+	}
 
 	@Override
 	public Material getMaterial(final int x, final int y, final int z) {

diff --git a/NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/BlockCacheCBDev.java b/NCPCompatCBDev/src/main/java/fr/neatmonster/nocheatplus/compat/cbdev/BlockCacheCBDev.java
@@ -84,6 +84,15 @@ public boolean standsOnEntity(final Entity entity, final double minX, final doub
 		}
 		return false;
 	}
+
+	/* (non-Javadoc)
+	 * @see fr.neatmonster.nocheatplus.utilities.BlockCache#cleanup()
+	 */
+	@Override
+	public void cleanup() {
+		super.cleanup();
+		world = null;
+	}
 
 	@Override
 	public Material getMaterial(final int x, final int y, final int z) {