diff --git a/Server/src/main/core/game/world/map/RegionChunk.java b/Server/src/main/core/game/world/map/RegionChunk.java index e86f2609e..385d7a705 100644 --- a/Server/src/main/core/game/world/map/RegionChunk.java +++ b/Server/src/main/core/game/world/map/RegionChunk.java @@ -635,7 +635,7 @@ public class RegionChunk { /** * Resets the flags. */ - public void resetFlags() { + public void resetUpdateFlags() { updateFlags.clear(); } @@ -658,7 +658,7 @@ public class RegionChunk { /** * Reinitializes the clipping flags; used when a region is copied into a new dynamic region. */ - public void syncFlagsToRegionManager() { + public void resetClippingFlags() { flags = new ChunkFlags(currentBase.getX(), currentBase.getY(), currentBase.getZ()); projectileFlags = new ChunkFlags(currentBase.getX(), currentBase.getY(), currentBase.getZ(), true); } @@ -667,7 +667,7 @@ public class RegionChunk { * Rebuilds the clipping flags based on those of a source chunk (used when a chunk is being replaced). * @param from The region plane to get the new clipping flags from. */ - public void rebuildFlags(RegionChunk from) { + public void rebuildClippingFlags(RegionChunk from) { for (int x = 0; x < 8; x++) { for (int y = 0; y < 8; y++) { // Import the landscape flags from the template chunk to the new chunk diff --git a/Server/src/main/core/game/world/map/build/DynamicRegion.java b/Server/src/main/core/game/world/map/build/DynamicRegion.java index 7e5ce124a..c1a7ac7de 100644 --- a/Server/src/main/core/game/world/map/build/DynamicRegion.java +++ b/Server/src/main/core/game/world/map/build/DynamicRegion.java @@ -290,8 +290,8 @@ public final class DynamicRegion extends Region { Location currentBase = getBaseLocation().transform(x << 3, y << 3, z); replacement.setCurrentBase(currentBase); replacement.rebaseObjects(); - replacement.rebuildFlags(orig); - replacement.syncFlagsToRegionManager(); + replacement.resetClippingFlags(); + replacement.rebuildClippingFlags(orig); for (NPC npc : orig.getNpcs()) { Location newLoc = currentBase.transform(npc.getLocation().getChunkOffsetX(), npc.getLocation().getChunkOffsetY(), 0); NPC copy = NPC.create(npc.getId(), newLoc, npc.getDirection()); diff --git a/Server/src/main/core/game/world/update/ChunkUpdateTracker.kt b/Server/src/main/core/game/world/update/ChunkUpdateTracker.kt index 03a3d9d0d..3db33d592 100644 --- a/Server/src/main/core/game/world/update/ChunkUpdateTracker.kt +++ b/Server/src/main/core/game/world/update/ChunkUpdateTracker.kt @@ -13,7 +13,7 @@ object ChunkUpdateTracker : ChunkDirtyListener { /** Resets flags on exactly the chunks flagged this tick. Must run after all per-player flushes. */ fun resetAll() { - dirty.forEach { it.resetFlags() } + dirty.forEach { it.resetUpdateFlags() } dirty.clear() } }