3
0
Mirror von https://github.com/IntellectualSites/FastAsyncWorldEdit.git synchronisiert 2024-12-26 02:50:06 +01:00

fix NPE with null sourcemask on move

Dieser Commit ist enthalten in:
dordsor21 2021-01-10 17:36:41 +00:00
Ursprung 846443291f
Commit 831c6f6854
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: 1E53E88969FFCF0B

Datei anzeigen

@ -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);
} }
} }