From cfc141d7319f6e3ad36eaaaef8b3f5ecf22e1265 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 25 Aug 2013 12:24:14 +1000 Subject: [PATCH] Subsequently remove hopper check option --- CraftBukkit-Patches/0040-Hopper-Cooldowns.patch | 10 ++++------ ...50-Allow-Disabling-of-Random-Lighting-Updates.patch | 8 ++++---- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch b/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch index 6e2ce1e22c..3883e224ac 100644 --- a/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch +++ b/CraftBukkit-Patches/0040-Hopper-Cooldowns.patch @@ -1,4 +1,4 @@ -From 64b8ebe5748932487931eafeec0a8c9b13ff2454 Mon Sep 17 00:00:00 2001 +From d80ca00523b48852557354d86428b0263ae7b143 Mon Sep 17 00:00:00 2001 From: DerFlash Date: Sun, 2 Jun 2013 16:23:46 +1000 Subject: [PATCH] Hopper Cooldowns @@ -48,21 +48,19 @@ index e8cd525..d406fbd 100644 } diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 8ef6c6a..4920e3f 100644 +index 8ef6c6a..e98ac1d 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -187,4 +187,13 @@ public class SpigotWorldConfig +@@ -187,4 +187,11 @@ public class SpigotWorldConfig maxTrackingRange = getInt( "entity-tracking-range.other", maxTrackingRange ); log( "Entity Tracking Range: Pl " + playerTrackingRange + " / An " + animalTrackingRange + " / Mo " + monsterTrackingRange + " / Mi " + miscTrackingRange + " / Other " + maxTrackingRange ); } + + public int hopperTransfer = 8; -+ public int hopperCheck = 8; + private void hoppers() + { -+ hopperCheck = getInt( "ticks-per.hopper-check", hopperCheck ); + hopperTransfer = getInt( "ticks-per.hopper-transfer", hopperTransfer ); -+ log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck ); ++ log( "Hopper Transfer: " + hopperTransfer ); + } } -- diff --git a/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch b/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch index bd46f6efed..c4ad695b9b 100644 --- a/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch +++ b/CraftBukkit-Patches/0050-Allow-Disabling-of-Random-Lighting-Updates.patch @@ -1,4 +1,4 @@ -From 3842ec165452cce601f31803ea8122b0d73f3911 Mon Sep 17 00:00:00 2001 +From f0961786f74fae30622858a9590bceb7f926d7ff Mon Sep 17 00:00:00 2001 From: md_5 Date: Sat, 22 Jun 2013 16:12:02 +1000 Subject: [PATCH] Allow Disabling of Random Lighting Updates @@ -18,12 +18,12 @@ index 211127b..8bd7876 100644 entityhuman = (EntityHuman) this.players.get(i); j = MathHelper.floor(entityhuman.locX) + this.random.nextInt(11) - 5; diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java -index 4920e3f..55878e5 100644 +index e98ac1d..13a5a33 100644 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java -@@ -196,4 +196,11 @@ public class SpigotWorldConfig +@@ -194,4 +194,11 @@ public class SpigotWorldConfig hopperTransfer = getInt( "ticks-per.hopper-transfer", hopperTransfer ); - log( "Hopper Transfer: " + hopperTransfer + " Hopper Check: " + hopperCheck ); + log( "Hopper Transfer: " + hopperTransfer ); } + + public boolean randomLightUpdates;