Captain-Chaos
/
WorldPainter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support schematics with missing entities or tileEntities tag

master
Captain Chaos 2022-08-21 17:24:54 +02:00
parent 46812dcda9
commit 31aba184a0
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
WorldPainter/WPCore/src/main/java/org/pepsoft/worldpainter/layers/bo2/Schematic.java
View File

@ -42,14 +42,16 @@ public final class Schematic extends AbstractNBTItem implements WPObject, Bo2Obj
addBlocks = getByteArray("AddBlocks");
data = getByteArray("Data");
List<CompoundTag> entityTags = getList("Entities");
if (entityTags.isEmpty()) {
// entitites has been observed to be missing sporadically in the wild, so check for that, and guess that it also
// applies to tileEntities
if ((entityTags == null) || entityTags.isEmpty()) {
entities = null;
} else {
entities = new ArrayList<>(entityTags.size());
entities.addAll(entityTags.stream().map((CompoundTag entityTag) -> Entity.fromNBT(entityTag, ((ListTag<DoubleTag>) entityTag.getTag(TAG_POS)).getValue().stream().mapToDouble(DoubleTag::getValue).toArray())).collect(Collectors.toList()));
}
List<CompoundTag> tileEntityTags = getList("TileEntities");
if (tileEntityTags.isEmpty()) {
if ((tileEntityTags == null) || tileEntityTags.isEmpty()) {
tileEntities = null;
} else {
tileEntities = new ArrayList<>(tileEntityTags.size());