Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2025-02-16 12:31:25 +01:00
Code Issues Projects Releases Wiki Activity

Fix for craftbukkit 1.10

Browse Source
This commit is contained in:
Jesse Boyd 2016-08-05 15:52:56 +10:00
parent 8e5e2ccafa
commit e57f2cb193
1 changed files with 66 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bukkit110/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
View File

@ -20,13 +20,13 @@ import com.sk89q.worldedit.internal.Constants;
import java.io.File; import java.io.File;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
@ -81,6 +81,7 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
private static IBlockData air; private static IBlockData air;
private static Field fieldBits; private static Field fieldBits;
private static Method getEntitySlices;
public BukkitQueue_1_10(final String world) { public BukkitQueue_1_10(final String world) {
super(world); super(world);
@ -92,6 +93,7 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
air = (IBlockData) fieldAir.get(null); air = (IBlockData) fieldAir.get(null);
fieldBits = DataPaletteBlock.class.getDeclaredField("b"); fieldBits = DataPaletteBlock.class.getDeclaredField("b");
fieldBits.setAccessible(true); fieldBits.setAccessible(true);
getEntitySlices = net.minecraft.server.v1_10_R1.Chunk.class.getDeclaredMethod("getEntitySlices");
if (adapter == null) { if (adapter == null) {
setupAdapter(new com.boydti.fawe.bukkit.v1_10.FaweAdapter_1_10()); setupAdapter(new com.boydti.fawe.bukkit.v1_10.FaweAdapter_1_10());
Fawe.debug("Using adapter: " + adapter); Fawe.debug("Using adapter: " + adapter);
@ -248,6 +250,7 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
if (!chunk.isLoaded()) { if (!chunk.isLoaded()) {
return; return;
} }
try {
net.minecraft.server.v1_10_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle(); net.minecraft.server.v1_10_R1.Chunk nmsChunk = ((CraftChunk) chunk).getHandle();
ChunkCoordIntPair pos = nmsChunk.k(); // getPosition() ChunkCoordIntPair pos = nmsChunk.k(); // getPosition()
WorldServer w = (WorldServer) nmsChunk.getWorld(); WorldServer w = (WorldServer) nmsChunk.getWorld();
@ -269,8 +272,8 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
return; return;
} }
HashSet<EntityTrackerEntry> entities = new HashSet<>(); HashSet<EntityTrackerEntry> entities = new HashSet<>();
List<Entity>[] entitieSlices = nmsChunk.getEntitySlices(); Collection<Entity>[] entitieSlices = (Collection<Entity>[]) getEntitySlices.invoke(nmsChunk);
for (List<Entity> slice : entitieSlices) { for (Collection<Entity> slice : entitieSlices) {
if (slice == null) { if (slice == null) {
continue; continue;
} }
@ -295,7 +298,7 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
player.playerConnection.sendPacket(packet); player.playerConnection.sendPacket(packet);
} }
// send ents // send ents
for (List<Entity> slice : entitieSlices) { for (Collection<Entity> slice : entitieSlices) {
if (slice == null) { if (slice == null) {
continue; continue;
} }
@ -321,6 +324,9 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<Chunk, ChunkSection[], Chunk
} }
} }
} }
} catch (Throwable e) {
e.printStackTrace();
}
} }
@Override @Override