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

No need to check WorldEdit schematics for bad entities

Browse Source
This commit is contained in:
dordsor21 2021-01-05 17:21:35 +00:00
parent 6db588a19f
commit 91de441403
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
worldedit-core/src/main/java/com/sk89q/worldedit/extent/clipboard/io/FastSchematicReader.java
View File

@ -99,6 +99,7 @@ public class FastSchematicReader extends NBTSchematicReader {
private char[] biomePalette; private char[] biomePalette;
private BlockVector3 min = BlockVector3.ZERO; private BlockVector3 min = BlockVector3.ZERO;
private boolean brokenEntities = false; private boolean brokenEntities = false;
private boolean isWorldEdit = false;
/** /**
@ -171,6 +172,10 @@ public class FastSchematicReader extends NBTSchematicReader {
metadata.add("WEOffsetZ").withInt((i, v) -> offsetZ = v); metadata.add("WEOffsetZ").withInt((i, v) -> offsetZ = v);
metadata.add("FAWEVersion").withInt((i, v) -> faweWritten = v); metadata.add("FAWEVersion").withInt((i, v) -> faweWritten = v);
StreamDelegate worldEditSection = metadata.add("WorldEdit");
worldEditSection.withValue((ValueReader<String>) (index, v) -> isWorldEdit = true);
StreamDelegate paletteDelegate = schematic.add("Palette"); StreamDelegate paletteDelegate = schematic.add("Palette");
paletteDelegate.withValue((ValueReader<Map<String, Object>>) (ignore, v) -> { paletteDelegate.withValue((ValueReader<Map<String, Object>>) (ignore, v) -> {
palette = new char[v.size()]; palette = new char[v.size()];
@ -389,7 +394,7 @@ public class FastSchematicReader extends NBTSchematicReader {
clipboard.createEntity(loc, state); clipboard.createEntity(loc, state);
continue; continue;
} }
if (faweWritten == -1) { if (!isWorldEdit && faweWritten == -1) {
int locX = loc.getBlockX(); int locX = loc.getBlockX();
int locY = loc.getBlockY(); int locY = loc.getBlockY();
int locZ = loc.getBlockZ(); int locZ = loc.getBlockZ();