Paper/Spigot-Server-Patches/0091-Check-async-remove-unused-vars-GH-159.patch

33 lines
1.6 KiB
Diff
Raw Normal View History

2017-05-04 23:08:52 +00:00
From a3ebbcc8a6227f77b06ad81db03bb9a514dfaa3d Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
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
2017-04-22 06:16:45 +00:00
index c79fb7d57..8749a1879 100644
--- a/src/main/java/net/minecraft/server/SpawnerCreature.java
+++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
2016-07-15 22:36:53 +00:00
@@ -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 {
2016-11-17 02:23:38 +00:00
@@ -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();
--
2017-05-04 23:08:52 +00:00
2.12.2