Brandon/FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix forge 1.7.10 CME

Browse Source
This commit is contained in:
Jesse Boyd 2018-01-29 13:03:49 +11:00
parent 7136fb422e
commit 21e976ce4d
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeChunk_All.java
View File

@ -182,7 +182,9 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
int y = MathMan.roundInt(entity.posY); int y = MathMan.roundInt(entity.posY);
if (y < 0 || y > 255) continue; if (y < 0 || y > 255) continue;
if (array[FaweCache.CACHE_J[y][z][x]] != 0) { if (array[FaweCache.CACHE_J[y][z][x]] != 0) {
nmsWorld.removeEntity(entity); synchronized (ForgeQueue_All.class) {
nmsWorld.removeEntity(entity);
}
} }
} }
} }
@ -193,7 +195,9 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
Collection<Entity> ents = new ArrayList<>(entities[i]); Collection<Entity> ents = new ArrayList<>(entities[i]);
for (Entity entity : ents) { for (Entity entity : ents) {
if (entsToRemove.contains(entity.getUniqueID())) { if (entsToRemove.contains(entity.getUniqueID())) {
nmsWorld.removeEntity(entity); synchronized (ForgeQueue_All.class) {
nmsWorld.removeEntity(entity);
}
} }
} }
} }
@ -223,7 +227,9 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
tag.removeTag("UUIDLeast"); tag.removeTag("UUIDLeast");
entity.readFromNBT(tag); entity.readFromNBT(tag);
entity.setPositionAndRotation(x, y, z, yaw, pitch); entity.setPositionAndRotation(x, y, z, yaw, pitch);
nmsWorld.spawnEntityInWorld(entity); synchronized (ForgeQueue_All.class) {
nmsWorld.spawnEntityInWorld(entity);
}
} }
} }
// Run change task if applicable // Run change task if applicable
@ -247,8 +253,10 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
} }
int k = FaweCache.CACHE_J[ly][lz][lx]; int k = FaweCache.CACHE_J[ly][lz][lx];
if (array[k] != 0) { if (array[k] != 0) {
tile.getValue().invalidate();; synchronized (ForgeQueue_All.class) {
iterator.remove(); tile.getValue().invalidate();
iterator.remove();
}
} }
} }
// Efficiently merge sections // Efficiently merge sections