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

Merge pull request #35 from Gerrygames/master

Browse Source 
fix NPE when reading sponge schematics with tile entities or entities
This commit is contained in:
Josh Knight 2019-02-01 08:47:35 -05:00 committed by GitHub
commit be41e8dea0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -210,6 +210,7 @@ public class SpongeSchematicReader extends NBTSchematicReader {
}); });
streamer.readFully(); streamer.readFully();
if (fc == null) setupClipboard(length * width * height, uuid); if (fc == null) setupClipboard(length * width * height, uuid);
else fc.setDimensions(new Vector(width, height, length));
Vector origin = min; Vector origin = min;
CuboidRegion region; CuboidRegion region;
if (offsetX != Integer.MIN_VALUE && offsetY != Integer.MIN_VALUE && offsetZ != Integer.MIN_VALUE) { if (offsetX != Integer.MIN_VALUE && offsetY != Integer.MIN_VALUE && offsetZ != Integer.MIN_VALUE) {
@ -242,7 +243,6 @@ public class SpongeSchematicReader extends NBTSchematicReader {
} }
} }
} }
fc.setDimensions(new Vector(width, height, length));
clipboard.init(region, fc); clipboard.init(region, fc);
clipboard.setOrigin(origin); clipboard.setOrigin(origin);
return clipboard; return clipboard;