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

fix NPE with null sourcemask on move

Browse Source
This commit is contained in:
dordsor21 2021-01-10 17:36:41 +00:00
parent 846443291f
commit 831c6f6854
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java
View File

@ -1627,10 +1627,11 @@ public class EditSession extends PassthroughExtent implements AutoCloseable {
} else { } else {
allowedRegion = new RegionIntersection(allowedRegions); allowedRegion = new RegionIntersection(allowedRegions);
} }
mask = MaskIntersection.of(getSourceMask(), mask, new RegionMask(allowedRegion)).optimize(); Mask sourceMask = this.getSourceMask();
mask = MaskIntersection.of(sourceMask, mask, new RegionMask(allowedRegion)).optimize();
if (mask != Masks.alwaysTrue()) { if (mask != Masks.alwaysTrue()) {
copy.setSourceMask(mask); copy.setSourceMask(mask);
if (this.getSourceMask().equals(mask)) { if (sourceMask != null && sourceMask.equals(mask)) {
setSourceMask(null); setSourceMask(null);
} }
} }