Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-16 17:16:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'breaking' into breaking-114

Browse Source
This commit is contained in:
Jesse Boyd 2019-07-17 06:08:18 +10:00
commit 71a9256617
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-bukkit/src/main/java/com/boydti/fawe/bukkit/v1_13/BukkitChunk_1_13.java
View File

@ -570,7 +570,10 @@ public class BukkitChunk_1_13 extends IntFaweChunk<Chunk, BukkitQueue_1_13> {
for (Map.Entry<BlockPosition, TileEntity> entry : toRemove.entrySet()) { for (Map.Entry<BlockPosition, TileEntity> entry : toRemove.entrySet()) {
BlockPosition bp = entry.getKey(); BlockPosition bp = entry.getKey();
TileEntity tile = entry.getValue(); TileEntity tile = entry.getValue();
nmsWorld.n(bp); tile.y();
// nmsWorld.c.remove(bp);
// nmsWorld.tileEntityList.remove(bp);
// nmsWorld.tileEntityListTick.remove(bp);
tiles.remove(bp); tiles.remove(bp);
tile.z(); tile.z();
tile.invalidateBlockCache(); tile.invalidateBlockCache();

17
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/SpongeSchematicReader.java
View File

@ -183,9 +183,20 @@ public class SpongeSchematicReader extends NBTSchematicReader {
setupClipboard(0, uuid); setupClipboard(0, uuid);
} }
int[] pos = value.getIntArray("Pos"); int[] pos = value.getIntArray("Pos");
int x = pos[0]; int x,y,z;
int y = pos[1]; if (pos.length != 3) {
int z = pos[2]; System.out.println("Invalid tile " + value);
if (!value.containsKey("x") || !value.containsKey("y") || !value.containsKey("z")) {
return;
}
x = value.getInt("x");
y = value.getInt("y");
z = value.getInt("z");
} else {
x = pos[0];
y = pos[1];
z = pos[2];
}
fc.setTile(x, y, z, value); fc.setTile(x, y, z, value);
} }
}); });