Brandon
/
FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #486

This commit is contained in:
Jesse Boyd 2017-04-20 17:04:07 +10:00
parent a08b68cac4
commit bc2879df99
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java
View File

@ -3,12 +3,10 @@ package com.boydti.fawe.bukkit.v0;
import com.boydti.fawe.Fawe; import com.boydti.fawe.Fawe;
import com.boydti.fawe.bukkit.FaweBukkit; import com.boydti.fawe.bukkit.FaweBukkit;
import com.boydti.fawe.config.Settings; import com.boydti.fawe.config.Settings;
import com.boydti.fawe.object.IntegerTrio;
import com.boydti.fawe.util.MathMan; import com.boydti.fawe.util.MathMan;
import com.boydti.fawe.util.TaskManager; import com.boydti.fawe.util.TaskManager;
import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap; import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.Map;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Chunk; import org.bukkit.Chunk;
import org.bukkit.Location; import org.bukkit.Location;
@ -39,7 +37,7 @@ public class ChunkListener implements Listener {
counter.clear(); counter.clear();
lastZ = Integer.MIN_VALUE; lastZ = Integer.MIN_VALUE;
for (Long badChunk : badChunks) { for (Long badChunk : badChunks) {
counter.put(badChunk, new IntegerTrio(Settings.IMP.TICK_LIMITER.PHYSICS, Settings.IMP.TICK_LIMITER.ITEMS, Settings.IMP.TICK_LIMITER.FALLING)); counter.put(badChunk, new int[]{Settings.IMP.TICK_LIMITER.PHYSICS, Settings.IMP.TICK_LIMITER.ITEMS, Settings.IMP.TICK_LIMITER.FALLING});
} }
badChunks.clear(); badChunks.clear();
} }
@ -51,20 +49,20 @@ public class ChunkListener implements Listener {
public static boolean itemFreeze = false; public static boolean itemFreeze = false;
private HashSet<Long> badChunks = new HashSet<>(); private HashSet<Long> badChunks = new HashSet<>();
private Map<Long, IntegerTrio> counter = new Long2ObjectOpenHashMap<>(); private Long2ObjectOpenHashMap<int[]> counter = new Long2ObjectOpenHashMap<>();
private int lastX = Integer.MIN_VALUE, lastZ = Integer.MIN_VALUE; private int lastX = Integer.MIN_VALUE, lastZ = Integer.MIN_VALUE;
private IntegerTrio lastCount; private int[] lastCount;
public IntegerTrio getCount(int cx, int cz) { public int[] getCount(int cx, int cz) {
if (lastX == cx && lastZ == cz) { if (lastX == cx && lastZ == cz) {
return lastCount; return lastCount;
} }
lastX = cx; lastX = cx;
lastZ = cz; lastZ = cz;
long pair = MathMan.pairInt(cx, cz); long pair = MathMan.pairInt(cx, cz);
IntegerTrio tmp = lastCount = counter.get(pair); int[] tmp = lastCount = counter.get(pair);
if (tmp == null) { if (tmp == null) {
lastCount = tmp = new IntegerTrio(); lastCount = tmp = new int[3];
counter.put(pair, tmp); counter.put(pair, tmp);
} }
return tmp; return tmp;
@ -92,16 +90,16 @@ public class ChunkListener implements Listener {
int z = block.getZ(); int z = block.getZ();
int cx = x >> 4; int cx = x >> 4;
int cz = z >> 4; int cz = z >> 4;
IntegerTrio count = getCount(cx, cz); int[] count = getCount(cx, cz);
if (count.x >= Settings.IMP.TICK_LIMITER.PHYSICS) { if (count[0] >= Settings.IMP.TICK_LIMITER.PHYSICS) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
if (event.getChangedType() == block.getType()) { if (event.getChangedTypeId() == block.getTypeId()) {
int y = block.getY(); int y = block.getY();
if (y != lastPhysY) { if (y != lastPhysY) {
lastPhysY = y; lastPhysY = y;
if (++count.x == Settings.IMP.TICK_LIMITER.PHYSICS) { if (++count[0] == Settings.IMP.TICK_LIMITER.PHYSICS) {
badChunks.add(MathMan.pairInt(cx, cz)); badChunks.add(MathMan.pairInt(cx, cz));
if (rateLimit <= 0) { if (rateLimit <= 0) {
rateLimit = 120; rateLimit = 120;
@ -127,10 +125,10 @@ public class ChunkListener implements Listener {
int z = block.getZ(); int z = block.getZ();
int cx = x >> 4; int cx = x >> 4;
int cz = z >> 4; int cz = z >> 4;
IntegerTrio count = getCount(cx, cz); int[] count = getCount(cx, cz);
if (++count.y >= Settings.IMP.TICK_LIMITER.FALLING) { if (++count[1] >= Settings.IMP.TICK_LIMITER.FALLING) {
if (count.y == Settings.IMP.TICK_LIMITER.FALLING) { if (count[1] == Settings.IMP.TICK_LIMITER.FALLING) {
count.x = Settings.IMP.TICK_LIMITER.PHYSICS; count[0] = Settings.IMP.TICK_LIMITER.PHYSICS;
badChunks.add(MathMan.pairInt(cx, cz)); badChunks.add(MathMan.pairInt(cx, cz));
Fawe.debug("[FAWE `tick-limiter`] Detected and cancelled falling block lag source at " + block.getLocation()); Fawe.debug("[FAWE `tick-limiter`] Detected and cancelled falling block lag source at " + block.getLocation());
} }
@ -149,10 +147,10 @@ public class ChunkListener implements Listener {
Location loc = event.getLocation(); Location loc = event.getLocation();
int cx = loc.getBlockX() >> 4; int cx = loc.getBlockX() >> 4;
int cz = loc.getBlockZ() >> 4; int cz = loc.getBlockZ() >> 4;
IntegerTrio count = getCount(cx, cz); int[] count = getCount(cx, cz);
if (++count.z >= Settings.IMP.TICK_LIMITER.ITEMS) { if (++count[2] >= Settings.IMP.TICK_LIMITER.ITEMS) {
if (count.z == Settings.IMP.TICK_LIMITER.ITEMS) { if (count[2] == Settings.IMP.TICK_LIMITER.ITEMS) {
count.x = Settings.IMP.TICK_LIMITER.PHYSICS; count[0] = Settings.IMP.TICK_LIMITER.PHYSICS;
cleanup(loc.getChunk()); cleanup(loc.getChunk());
badChunks.add(MathMan.pairInt(cx, cz)); badChunks.add(MathMan.pairInt(cx, cz));
if (rateLimit <= 0) { if (rateLimit <= 0) {