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

Stop writing corrupt tile entities to schematics

Browse Source 
also make some stuff definitely immutable.
This commit is contained in:
dordsor21 2020-12-13 21:06:36 +00:00
parent 04ba545aa2
commit 6676d77aaa
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
worldedit-bukkit/src/main/resources/worldedit-adapters.jar
View File

Binary file not shown.

11
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/FastSchematicWriter.java
View File

@ -159,15 +159,16 @@ public class FastSchematicWriter implements ClipboardWriter {
if (nbt != null) { if (nbt != null) {
Map<String, Tag> values = nbt.getValue(); Map<String, Tag> values = nbt.getValue();
values.remove("id"); // Remove 'id' if it exists. We want 'Id'
// Positions are kept in NBT, we don't want that. // Positions are kept in NBT, we don't want that.
values.remove("x"); values.remove("x");
values.remove("y"); values.remove("y");
values.remove("z"); values.remove("z");
if (!values.containsKey("Id")) { values.put("Id", new StringTag(block.getNbtId()));
values.put("Id", new StringTag(block.getNbtId()));
} // Remove 'id' if it exists. We want 'Id'.
// Do this after we get "getNbtId" cos otherwise "getNbtId" doesn't work.
// Dum.
values.remove("id");
values.put("Pos", new IntArrayTag(new int[]{ values.put("Pos", new IntArrayTag(new int[]{
pos.getX(), pos.getX(),
pos.getY(), pos.getY(),

17
worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BaseBlock.java
View File

@ -49,13 +49,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
*/ */
public class BaseBlock implements BlockStateHolder<BaseBlock>, TileEntityBlock { public class BaseBlock implements BlockStateHolder<BaseBlock>, TileEntityBlock {
private BlockState blockState; private final BlockState blockState;
@Nullable private CompoundTag nbtData; @Nullable private final CompoundTag nbtData;
@Deprecated
public BaseBlock() {
this(BlockTypes.AIR.getDefaultState());
}
/** /**
* Construct a block with the given type and default data. * Construct a block with the given type and default data.
@ -151,6 +146,9 @@ public class BaseBlock implements BlockStateHolder<BaseBlock>, TileEntityBlock {
return ""; return "";
} }
Tag idTag = nbtData.getValue().get("id"); Tag idTag = nbtData.getValue().get("id");
if (idTag == null) {
idTag = nbtData.getValue().get("Id");
}
if (idTag instanceof StringTag) { if (idTag instanceof StringTag) {
return ((StringTag) idTag).getValue(); return ((StringTag) idTag).getValue();
} else { } else {
@ -164,6 +162,11 @@ public class BaseBlock implements BlockStateHolder<BaseBlock>, TileEntityBlock {
return this.nbtData; return this.nbtData;
} }
@Override
public void setNbtData(@Nullable CompoundTag nbtData) {
throw new UnsupportedOperationException("This class is immutable.");
}
/** /**
* Checks whether the type ID and data value are equal. * Checks whether the type ID and data value are equal.
*/ */