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

Merge pull request #516 from EngineHub/bugfix/memory-followups

Browse Source 
Add validator extent to every entry point, fix extent ordering
This commit is contained in:
Kenzie Togami 2019-08-12 20:24:23 -07:00 committed by GitHub
commit 487da77a72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -184,13 +184,8 @@ public class EditSession implements Extent, AutoCloseable {
private @Nullable FastModeExtent fastModeExtent; private @Nullable FastModeExtent fastModeExtent;
private final SurvivalModeExtent survivalExtent; private final SurvivalModeExtent survivalExtent;
private @Nullable ChunkBatchingExtent chunkBatchingExtent; private @Nullable ChunkBatchingExtent chunkBatchingExtent;
private @Nullable ChunkLoadingExtent chunkLoadingExtent;
private @Nullable LastAccessExtentCache cacheExtent;
private @Nullable BlockQuirkExtent quirkExtent;
private @Nullable DataValidatorExtent validator;
private final BlockBagExtent blockBagExtent; private final BlockBagExtent blockBagExtent;
private final MultiStageReorder reorderExtent; private final MultiStageReorder reorderExtent;
private @Nullable ChangeSetExtent changeSetExtent;
private final MaskingExtent maskingExtent; private final MaskingExtent maskingExtent;
private final BlockChangeLimiter changeLimiter; private final BlockChangeLimiter changeLimiter;
@ -224,27 +219,25 @@ public class EditSession implements Extent, AutoCloseable {
// These extents are ALWAYS used // These extents are ALWAYS used
extent = fastModeExtent = new FastModeExtent(world, false); extent = fastModeExtent = new FastModeExtent(world, false);
extent = survivalExtent = new SurvivalModeExtent(extent, world); extent = survivalExtent = new SurvivalModeExtent(extent, world);
extent = quirkExtent = new BlockQuirkExtent(extent, world); extent = new BlockQuirkExtent(extent, world);
extent = chunkLoadingExtent = new ChunkLoadingExtent(extent, world); extent = new ChunkLoadingExtent(extent, world);
extent = cacheExtent = new LastAccessExtentCache(extent); extent = new LastAccessExtentCache(extent);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_CHANGE);
extent = validator = new DataValidatorExtent(extent, world);
extent = blockBagExtent = new BlockBagExtent(extent, blockBag); extent = blockBagExtent = new BlockBagExtent(extent, blockBag);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_CHANGE);
this.bypassReorderHistory = new DataValidatorExtent(extent, world);
// This extent can be skipped by calling rawSetBlock() // This extent can be skipped by calling rawSetBlock()
extent = reorderExtent = new MultiStageReorder(extent, false); extent = reorderExtent = new MultiStageReorder(extent, false);
extent = chunkBatchingExtent = new ChunkBatchingExtent(extent); extent = chunkBatchingExtent = new ChunkBatchingExtent(extent);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_REORDER); extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_REORDER);
this.bypassHistory = new DataValidatorExtent(extent, world);
// These extents can be skipped by calling smartSetBlock() // These extents can be skipped by calling smartSetBlock()
extent = changeSetExtent = new ChangeSetExtent(extent, changeSet); extent = new ChangeSetExtent(extent, changeSet);
extent = maskingExtent = new MaskingExtent(extent, Masks.alwaysTrue()); extent = maskingExtent = new MaskingExtent(extent, Masks.alwaysTrue());
extent = changeLimiter = new BlockChangeLimiter(extent, maxBlocks); extent = changeLimiter = new BlockChangeLimiter(extent, maxBlocks);
extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_HISTORY); extent = wrapExtent(extent, eventBus, event, Stage.BEFORE_HISTORY);
this.bypassNone = new DataValidatorExtent(extent, world);
this.bypassReorderHistory = blockBagExtent;
this.bypassHistory = reorderExtent;
this.bypassNone = extent;
} else { } else {
Extent extent = new NullExtent(); Extent extent = new NullExtent();
extent = survivalExtent = new SurvivalModeExtent(extent, NullWorld.getInstance()); extent = survivalExtent = new SurvivalModeExtent(extent, NullWorld.getInstance());