diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-05 21:43:47 +0100 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-17 10:32:59 +0100 |
| commit | a48660074969c52ed2547e02981d224b696f93e2 (patch) | |
| tree | fac414d927c9edfae7b91ed7e698f294ff3b700b /nms-patches/WorldServer.patch | |
| parent | 0a645a2726f031cc2d2c2a801574021283cf50ee (diff) | |
| download | craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.gz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.lz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.xz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.zip | |
Update to 1.8.4
Diffstat (limited to 'nms-patches/WorldServer.patch')
| -rw-r--r-- | nms-patches/WorldServer.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/WorldServer.patch b/nms-patches/WorldServer.patch index 4169daec..38ee1e5f 100644 --- a/nms-patches/WorldServer.patch +++ b/nms-patches/WorldServer.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/WorldServer.java 2015-04-13 11:02:47.684046165 +0100 -+++ src/main/java/net/minecraft/server/WorldServer.java 2015-04-13 11:02:47.688046165 +0100 +--- /home/matt/mc-dev-private//net/minecraft/server/WorldServer.java 2015-05-05 21:41:21.448627230 +0100 ++++ src/main/java/net/minecraft/server/WorldServer.java 2015-05-05 21:41:21.452627171 +0100 @@ -16,14 +16,27 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -56,7 +56,7 @@ + this.Q = new org.bukkit.craftbukkit.CraftTravelAgent(this); // CraftBukkit this.B(); this.C(); - this.getWorldBorder().a(minecraftserver.aH()); + this.getWorldBorder().a(minecraftserver.aI()); @@ -63,6 +84,7 @@ this.villages.a((World) this); } @@ -202,7 +202,7 @@ public BiomeBase.BiomeMeta a(EnumCreatureType enumcreaturetype, BlockPosition blockposition) { @@ -161,7 +281,7 @@ - if (entityhuman.v()) { + if (entityhuman.isSpectator()) { ++i; - } else if (entityhuman.isSleeping()) { + } else if (entityhuman.isSleeping() || entityhuman.fauxSleeping) { @@ -249,13 +249,13 @@ } entityhuman = (EntityHuman) iterator.next(); -- } while (!entityhuman.v() && entityhuman.isDeeplySleeping()); +- } while (!entityhuman.isSpectator() && entityhuman.isDeeplySleeping()); + + // CraftBukkit start + if (entityhuman.isDeeplySleeping()) { + foundActualSleepers = true; + } -+ } while (!entityhuman.v() && (entityhuman.isDeeplySleeping() || entityhuman.fauxSleeping)); ++ } while (!entityhuman.isSpectator() && (entityhuman.isDeeplySleeping() || entityhuman.fauxSleeping)); + // CraftBukkit end return false; |