From 9bea95dd225f101b0d47f017b847af9e1335d65d Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Fri, 9 Dec 2016 22:49:23 +1100 Subject: [PATCH] Configurable tick limiter interval --- .../boydti/fawe/bukkit/v0/ChunkListener.java | 49 +------------------ .../java/com/boydti/fawe/config/Settings.java | 8 +-- 2 files changed, 6 insertions(+), 51 deletions(-) diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java index 8a8f0711..7ff689b7 100644 --- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java +++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v0/ChunkListener.java @@ -39,7 +39,7 @@ public class ChunkListener implements Listener { } badChunks.clear(); } - }, 1); + }, Settings.TICK_LIMITER.INTERVAL); } } @@ -75,53 +75,6 @@ public class ChunkListener implements Listener { } - public boolean isRedstone(int id) { - switch (id) { - // wire - case 55: - // comparator - case 149: - case 150: - // diode - case 93: - case 94: - // torch - case 75: - case 76: - // rail - case 27: - case 23: // dispensor - case 158: // dropper - case 25: - // piston - case 29: - case 33: - // tnt - case 44: - // door - case 96: // trapdoor - case 167: - case 107: // fence - case 183: - case 184: - case 185: - case 186: - case 187: - // lamp - case 123: - case 124: - // BUD - case 73: // ore - case 74: - case 8: // water - case 9: - case 34: // piston - return true; - default: - return false; - } - } - private int lastPhysY = 0; @EventHandler(priority = EventPriority.LOWEST) diff --git a/core/src/main/java/com/boydti/fawe/config/Settings.java b/core/src/main/java/com/boydti/fawe/config/Settings.java index 6fa10a54..94f8b0ec 100644 --- a/core/src/main/java/com/boydti/fawe/config/Settings.java +++ b/core/src/main/java/com/boydti/fawe/config/Settings.java @@ -246,11 +246,13 @@ public class Settings extends Config { public static class TICK_LIMITER { @Comment("Enable the limiter") public static boolean ENABLED = true; - @Comment("Max falling blocks per tick (per chunk)") + @Comment("The interval in ticks") + public static int INTERVAL = 1; + @Comment("Max falling blocks per interval (per chunk)") public static int FALLING = 512; - @Comment("Max physics per tick (per chunk)") + @Comment("Max physics per interval (per chunk)") public static int PHYSICS = 512; - @Comment("Max item spawns per tick (per chunk)") + @Comment("Max item spawns per interval (per chunk)") public static int ITEMS = 48; }