From bf877b9a72a61785f2da2d12f694f1130d833659 Mon Sep 17 00:00:00 2001 From: Zach Brown Date: Sun, 27 Mar 2016 20:31:23 -0500 Subject: [PATCH] Check async spawn chunk check, remove unused variables, GH-159 --- ...heck-async-remove-unused-vars-GH-159.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch diff --git a/Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch new file mode 100644 index 0000000000..8969d5d55c --- /dev/null +++ b/Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch @@ -0,0 +1,32 @@ +From db79e2147e8e32f9dfe403a2253e7a94ddf44b38 Mon Sep 17 00:00:00 2001 +From: Zach Brown +Date: Sun, 27 Mar 2016 20:24:05 -0500 +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 +index 721bcae..3ba55d7 100644 +--- a/src/main/java/net/minecraft/server/SpawnerCreature.java ++++ b/src/main/java/net/minecraft/server/SpawnerCreature.java +@@ -38,6 +38,7 @@ public final class SpawnerCreature { + // Spigot end + + public int a(WorldServer worldserver, boolean flag, boolean flag1, boolean flag2) { ++ org.spigotmc.AsyncCatcher.catchOp("check for eligible spawn chunks"); // Paper - At least until we figure out what is calling this async + if (!flag && !flag1) { + return 0; + } else { +@@ -118,8 +119,10 @@ 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(); +-- +2.7.4 +