SteamWar/SpigotCore
SteamWar/SpigotCore
12
0
Fork 0
Code Issues 4 Pull-Requests Releases Wiki Aktivität

Ignore bad schematic tileentity coordinates

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Lixfel 2020-04-04 13:20:15 +02:00
Ursprung aaed31f072
Commit 6e616c6366
1 geänderte Dateien mit 25 neuen und 22 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

47
SpigotCore_14/src/de/steamwar/sql/Schematic_14.java
Datei anzeigen

@ -239,34 +239,37 @@ class Schematic_14 {
int index = y * width * length + z * width + x; int index = y * width * length + z * width + x;
BlockState block = getBlockState(blocks[index], blockData[index]); try{
System.out.println(block.getBlockType().getId()); BlockState block = getBlockState(blocks[index], blockData[index]);
BlockState newBlock = block; BlockState newBlock = block;
if (newBlock != null) { if (newBlock != null) {
for (NBTCompatibilityHandler handler : COMPATIBILITY_HANDLERS) { for (NBTCompatibilityHandler handler : COMPATIBILITY_HANDLERS) {
if (handler.isAffectedBlock(newBlock)) { if (handler.isAffectedBlock(newBlock)) {
newBlock = handler.updateNBT(block, values); newBlock = handler.updateNBT(block, values);
if (newBlock == null || values.isEmpty()) { if (newBlock == null || values.isEmpty()) {
break; break;
}
} }
} }
} }
} if (values.isEmpty()) {
if (values.isEmpty()) { t = null;
t = null; } else {
} else { t = new CompoundTag(values);
t = new CompoundTag(values); }
}
if (fixer != null && t != null) { if (fixer != null && t != null) {
t = fixer.fixUp(DataFixer.FixTypes.BLOCK_ENTITY, t, -1); t = fixer.fixUp(DataFixer.FixTypes.BLOCK_ENTITY, t, -1);
} }
BlockVector3 vec = BlockVector3.at(x, y, z); BlockVector3 vec = BlockVector3.at(x, y, z);
if (t != null) { if (t != null) {
tileEntitiesMap.put(vec, t.getValue()); tileEntitiesMap.put(vec, t.getValue());
}
blockStates.put(vec, newBlock);
}catch(ArrayIndexOutOfBoundsException e){
//ignored
} }
blockStates.put(vec, newBlock);
} }
BlockArrayClipboard clipboard = new BlockArrayClipboard(region); BlockArrayClipboard clipboard = new BlockArrayClipboard(region);