Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-11-24 03:25:24 +01:00
Code Issues Projects Releases Wiki Activity

Try last ChunkState accessed in ChunkHashTable.

Browse Source
This commit is contained in:
sk89q 2014-08-18 10:57:02 -07:00
parent 039d174477
commit 1a781fc5b0
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/sk89q/worldguard/protection/managers/index/ChunkHashTable.java
View File

@ -55,6 +55,8 @@ public class ChunkHashTable implements ConcurrentRegionIndex {
private LongHashTable<ChunkState> states = new LongHashTable<ChunkState>();
private final RegionIndex index;
private final Object lock = new Object();
@Nullable
private ChunkState lastState;
/**
* Create a new instance.
@ -130,6 +132,8 @@ private void rebuild() {
if (!positions.isEmpty()) {
executor.submit(new EnumerateRegions(positions));
}
lastState = null;
}
}
@ -172,6 +176,10 @@ public void forget(Vector2D chunkPosition) {
checkNotNull(chunkPosition);
synchronized (lock) {
states.remove(chunkPosition.getBlockX(), chunkPosition.getBlockZ());
ChunkState state = lastState;
if (state != null && state.getPosition().getBlockX() == chunkPosition.getBlockX() && state.getPosition().getBlockZ() == chunkPosition.getBlockZ()) {
lastState = null;
}
}
}
@ -181,6 +189,7 @@ public void forgetAll() {
executor.shutdownNow();
states = new LongHashTable<ChunkState>();
executor = createExecutor();
lastState = null;
}
}
@ -224,7 +233,14 @@ public void applyContaining(Vector position, Predicate<ProtectedRegion> consumer
checkNotNull(position);
checkNotNull(consumer);
ChunkState state = get(new Vector2D(position.getBlockX() >> 4, position.getBlockZ() >> 4), false);
ChunkState state = lastState;
int chunkX = position.getBlockX() >> 4;
int chunkZ = position.getBlockZ() >> 4;
if (state == null || state.getPosition().getBlockX() != chunkX || state.getPosition().getBlockZ() != chunkZ) {
state = get(new Vector2D(chunkX, chunkZ), false);
}
if (state != null && state.isLoaded()) {
for (ProtectedRegion region : state.getRegions()) {
if (region.contains(position)) {