33 Zeilen
1.6 KiB
Diff
33 Zeilen
1.6 KiB
Diff
From 05023155fb6a414d96f5b04f20ceec957c5e4a3b 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
|
|
index 31bafc6..f6e330c 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.9.3
|
|
|