aboutsummaryrefslogtreecommitdiffhomepage
path: root/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
diff options
context:
space:
mode:
Diffstat (limited to 'Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch')
-rw-r--r--Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch b/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
new file mode 100644
index 0000000000..16bff70638
--- /dev/null
+++ b/Spigot-Server-Patches/0093-Check-async-remove-unused-vars-GH-159.patch
@@ -0,0 +1,32 @@
+From 931dd1b6fbddd6576e436007a749078ceae64f1a Mon Sep 17 00:00:00 2001
+From: Zach Brown <[email protected]>
+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 c79fb7d57..8749a1879 100644
+--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
++++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
+@@ -40,6 +40,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 {
+@@ -120,8 +121,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.12.2
+