Processor should be added to queue, not extent (#1809)

- Fixes #1559 root cause
This commit is contained in:
Jordan 2022-06-16 15:23:45 +01:00 committed by GitHub
parent 9395b3c575
commit ac11da855a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -567,16 +567,16 @@ public final class EditSessionBuilder {
relighter = WorldEdit.getInstance().getPlatformManager() relighter = WorldEdit.getInstance().getPlatformManager()
.queryCapability(Capability.WORLD_EDITING) .queryCapability(Capability.WORLD_EDITING)
.getRelighterFactory().createRelighter(relightMode, world, queue); .getRelighterFactory().createRelighter(relightMode, world, queue);
extent.addProcessor(new RelightProcessor(relighter)); queue.addProcessor(new RelightProcessor(relighter));
} }
extent.addProcessor(new HeightmapProcessor(world.getMinY(), world.getMaxY())); queue.addProcessor(new HeightmapProcessor(world.getMinY(), world.getMaxY()));
IBatchProcessor platformProcessor = WorldEdit IBatchProcessor platformProcessor = WorldEdit
.getInstance() .getInstance()
.getPlatformManager() .getPlatformManager()
.queryCapability(Capability.WORLD_EDITING) .queryCapability(Capability.WORLD_EDITING)
.getPlatformProcessor(fastMode); .getPlatformProcessor(fastMode);
if (platformProcessor != null) { if (platformProcessor != null) {
extent.addProcessor(platformProcessor); queue.addProcessor(platformProcessor);
} }
IBatchProcessor platformPostProcessor = WorldEdit IBatchProcessor platformPostProcessor = WorldEdit
.getInstance() .getInstance()
@ -584,7 +584,7 @@ public final class EditSessionBuilder {
.queryCapability(Capability.WORLD_EDITING) .queryCapability(Capability.WORLD_EDITING)
.getPlatformPostProcessor(fastMode); .getPlatformPostProcessor(fastMode);
if (platformPostProcessor != null) { if (platformPostProcessor != null) {
extent.addPostProcessor(platformPostProcessor); queue.addPostProcessor(platformPostProcessor);
} }
} else { } else {
relighter = NullRelighter.INSTANCE; relighter = NullRelighter.INSTANCE;
@ -598,7 +598,7 @@ public final class EditSessionBuilder {
} }
if (this.limit != null && this.limit.STRIP_NBT != null && !this.limit.STRIP_NBT.isEmpty()) { if (this.limit != null && this.limit.STRIP_NBT != null && !this.limit.STRIP_NBT.isEmpty()) {
if (placeChunks) { if (placeChunks) {
extent.addProcessor(new StripNBTExtent(this.extent, this.limit.STRIP_NBT)); queue.addProcessor(new StripNBTExtent(this.extent, this.limit.STRIP_NBT));
} else { } else {
this.extent = new StripNBTExtent(this.extent, this.limit.STRIP_NBT); this.extent = new StripNBTExtent(this.extent, this.limit.STRIP_NBT);
} }
@ -614,7 +614,7 @@ public final class EditSessionBuilder {
Set<PropertyRemap<?>> remaps = this.limit.REMAP_PROPERTIES; Set<PropertyRemap<?>> remaps = this.limit.REMAP_PROPERTIES;
if (!limitBlocks.isEmpty() || (remaps != null && !remaps.isEmpty())) { if (!limitBlocks.isEmpty() || (remaps != null && !remaps.isEmpty())) {
if (placeChunks) { if (placeChunks) {
extent.addProcessor(new DisallowedBlocksExtent(this.extent, limitBlocks, remaps)); queue.addProcessor(new DisallowedBlocksExtent(this.extent, limitBlocks, remaps));
} else { } else {
this.extent = new DisallowedBlocksExtent(this.extent, limitBlocks, remaps); this.extent = new DisallowedBlocksExtent(this.extent, limitBlocks, remaps);
} }