Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-27 20:58:40 +01:00
Code Issues Projects Releases Wiki Activity

Revert "Revert "Remove duplicate removeEntities - Fixes #1838""

Browse Source 
This reverts commit 834d315545.
This commit is contained in:
Mike Primm 2016-03-28 19:20:06 -05:00
parent 834d315545
commit 9b72e5b3f1
4 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/dynmap/bukkit/BukkitVersionHelper.java
View File

@ -88,10 +88,6 @@ public abstract class BukkitVersionHelper {
* Test if normal chunk snapshot * Test if normal chunk snapshot
*/ */
// public abstract boolean isCraftChunkSnapshot(ChunkSnapshot css); // public abstract boolean isCraftChunkSnapshot(ChunkSnapshot css);
/**
* Remove entities from given chunk
*/
public abstract void removeEntitiesFromChunk(Chunk c);
/** /**
* Get inhabited ticks count from chunk * Get inhabited ticks count from chunk
*/ */

2
src/main/java/org/dynmap/bukkit/BukkitVersionHelperCB.java
View File

@ -102,7 +102,6 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
} }
/** n.m.s.Chunk */ /** n.m.s.Chunk */
nmschunk = getNMSClass("net.minecraft.server.Chunk"); nmschunk = getNMSClass("net.minecraft.server.Chunk");
nmsc_removeentities = getMethod(nmschunk, new String[] { "removeEntities" }, nulltypes);
nmsc_tileentities = getField(nmschunk, new String[] { "tileEntities" }, Map.class); nmsc_tileentities = getField(nmschunk, new String[] { "tileEntities" }, Map.class);
nmsc_inhabitedticks = getFieldNoFail(nmschunk, new String[] { "s", "q", "u", "v" }, long.class); nmsc_inhabitedticks = getFieldNoFail(nmschunk, new String[] { "s", "q", "u", "v" }, long.class);
if (nmsc_inhabitedticks == null) { if (nmsc_inhabitedticks == null) {
@ -157,7 +156,6 @@ public class BukkitVersionHelperCB extends BukkitVersionHelperGeneric {
} }
@Override @Override
public void unloadChunkNoSave(World w, Chunk c, int cx, int cz) { public void unloadChunkNoSave(World w, Chunk c, int cx, int cz) {
this.removeEntitiesFromChunk(c);
w.unloadChunk(cx, cz, false, false); w.unloadChunk(cx, cz, false, false);
} }
/** /**

9
src/main/java/org/dynmap/bukkit/BukkitVersionHelperGeneric.java
View File

@ -54,7 +54,6 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
protected Method lhs_containskey; protected Method lhs_containskey;
/** n.m.s.Chunk */ /** n.m.s.Chunk */
protected Class<?> nmschunk; protected Class<?> nmschunk;
protected Method nmsc_removeentities;
protected Field nmsc_tileentities; protected Field nmsc_tileentities;
protected Field nmsc_inhabitedticks; protected Field nmsc_inhabitedticks;
/** nbt classes */ /** nbt classes */
@ -336,13 +335,7 @@ public abstract class BukkitVersionHelperGeneric extends BukkitVersionHelper {
// } // }
// return false; // return false;
// } // }
/** Remove entities from given chunk */
public void removeEntitiesFromChunk(Chunk c) {
Object omsc = callMethod(c, cc_gethandle, nullargs, null);
if(omsc != null) {
callMethod(omsc, nmsc_removeentities, nullargs, null);
}
}
/** /**
* Get inhabited ticks count from chunk * Get inhabited ticks count from chunk
*/ */

6
src/main/java/org/dynmap/bukkit/BukkitVersionHelperGlowstone.java
View File

@ -91,12 +91,6 @@ public class BukkitVersionHelperGlowstone extends BukkitVersionHelper {
return b; return b;
} }
@Override
public void removeEntitiesFromChunk(Chunk c) {
// TODO Auto-generated method stub
}
@Override @Override
public long getInhabitedTicks(Chunk c) { public long getInhabitedTicks(Chunk c) {
// TODO Auto-generated method stub // TODO Auto-generated method stub