From 19eb02cab08be0347ff0941e134ee9a82500d318 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Thu, 14 Apr 2016 19:26:57 -0500 Subject: [PATCH] Revert "Only check for async callers, do not remove potentially used variables" This reverts commit 271e7c5cb415386215a4843a02a2463438eb47d3. --- ... => Check-async-remove-unused-vars-GH-159.patch} | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) rename Spigot-Server-Patches/{Check-async-eligible-spawn-chunks-GH-159.patch => Check-async-remove-unused-vars-GH-159.patch} (52%) diff --git a/Spigot-Server-Patches/Check-async-eligible-spawn-chunks-GH-159.patch b/Spigot-Server-Patches/Check-async-remove-unused-vars-GH-159.patch similarity index 52% rename from Spigot-Server-Patches/Check-async-eligible-spawn-chunks-GH-159.patch rename to Spigot-Server-Patches/Check-async-remove-unused-vars-GH-159.patch index b4ad07710..539de02c8 100644 --- a/Spigot-Server-Patches/Check-async-eligible-spawn-chunks-GH-159.patch +++ b/Spigot-Server-Patches/Check-async-remove-unused-vars-GH-159.patch @@ -1,7 +1,7 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Zach Brown <1254957+zachbr@users.noreply.github.com> Date: Sun, 27 Mar 2016 20:24:05 -0500 -Subject: [PATCH] Check async, eligible spawn chunks, GH-159 +Subject: [PATCH] Check async, remove unused vars, GH-159 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java @@ -16,4 +16,15 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 if (!flag && !flag1) { return 0; } else { +@@ -0,0 +0,0 @@ public final class SpawnerCreature { + // CraftBukkit end + + if ((!enumcreaturetype.d() || flag1) && (enumcreaturetype.d() || flag) && (!enumcreaturetype.e() || flag2)) { ++ /* Paper start - As far as I can tell neither of these are even used + k = worldserver.a(enumcreaturetype.a()); + int l1 = limit * i / a; // CraftBukkit - use per-world limits ++ */ // Paper end + + if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) { + BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(); -- \ No newline at end of file