Dieser Commit ist enthalten in:
Jesse Boyd 2019-04-14 00:07:17 +10:00
Ursprung 110f782a5c
Commit edde2ebe51
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 59F1DE6293AF6E1F
3 geänderte Dateien mit 2 neuen und 5 gelöschten Zeilen

Datei anzeigen

@ -514,7 +514,8 @@ public class BukkitQueue_1_13 extends BukkitQueue_0<net.minecraft.server.v1_13_R
public int getCombinedId4Data(ChunkSection lastSection, int x, int y, int z) { public int getCombinedId4Data(ChunkSection lastSection, int x, int y, int z) {
DataPaletteBlock<IBlockData> dataPalette = lastSection.getBlocks(); DataPaletteBlock<IBlockData> dataPalette = lastSection.getBlocks();
IBlockData ibd = dataPalette.a(x & 15, y & 15, z & 15); IBlockData ibd = dataPalette.a(x & 15, y & 15, z & 15);
return ((Spigot_v1_13_R2) getAdapter()).adaptToInt(ibd); int ordinal = ((Spigot_v1_13_R2) getAdapter()).adaptToInt(ibd);
return BlockTypes.states[ordinal].getInternalId();
} }
@Override @Override

Datei anzeigen

@ -83,7 +83,6 @@ public class BukkitWorld extends AbstractWorld {
@Override @Override
public List<com.sk89q.worldedit.entity.Entity> getEntities(Region region) { public List<com.sk89q.worldedit.entity.Entity> getEntities(Region region) {
System.out.println(Fawe.isMainThread());
World world = getWorld(); World world = getWorld();
List<Entity> ents = world.getEntities(); List<Entity> ents = world.getEntities();
@ -98,7 +97,6 @@ public class BukkitWorld extends AbstractWorld {
@Override @Override
public List<com.sk89q.worldedit.entity.Entity> getEntities() { public List<com.sk89q.worldedit.entity.Entity> getEntities() {
System.out.println(Fawe.isMainThread());
List<com.sk89q.worldedit.entity.Entity> list = new ArrayList<>(); List<com.sk89q.worldedit.entity.Entity> list = new ArrayList<>();
for (Entity entity : getWorld().getEntities()) { for (Entity entity : getWorld().getEntities()) {
list.add(BukkitAdapter.adapt(entity)); list.add(BukkitAdapter.adapt(entity));

Datei anzeigen

@ -149,13 +149,11 @@ public class FastWorldEditExtent extends AbstractDelegateExtent implements HasFa
@Override @Override
public List<? extends Entity> getEntities() { public List<? extends Entity> getEntities() {
System.out.println("World cp * " + world + " | " + world.getClass());
return world.getEntities(); return world.getEntities();
} }
@Override @Override
public List<? extends Entity> getEntities(final Region region) { public List<? extends Entity> getEntities(final Region region) {
System.out.println("World cp rg " + world + " | " + world.getClass());
return world.getEntities(region); return world.getEntities(region);
} }