From 1e56438ac05041e43b374a9fd38461716d4ac1fc Mon Sep 17 00:00:00 2001 From: Thinkofdeath Date: Sat, 7 Mar 2015 15:02:53 +0000 Subject: SPIGOT-654: Use the server player list instead of the world for boss spawn/death sounds --- nms-patches/EntityEnderDragon.patch | 6 +++--- nms-patches/EntityWither.patch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nms-patches/EntityEnderDragon.patch b/nms-patches/EntityEnderDragon.patch index 86bda9c1..e1e37b93 100644 --- a/nms-patches/EntityEnderDragon.patch +++ b/nms-patches/EntityEnderDragon.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/EntityEnderDragon.java 2015-02-26 22:40:22.515608140 +0000 -+++ src/main/java/net/minecraft/server/EntityEnderDragon.java 2015-02-26 22:40:22.515608140 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityEnderDragon.java 2015-03-07 15:02:37.630567220 +0000 ++++ src/main/java/net/minecraft/server/EntityEnderDragon.java 2015-03-07 15:02:37.630567220 +0000 @@ -5,6 +5,17 @@ import java.util.Iterator; import java.util.List; @@ -165,7 +165,7 @@ + // CraftBukkit start - Use relative location for far away sounds + // this.world.a(1018, new BlockPosition(this), 0); + int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; -+ for (EntityPlayer player : (List) (List) this.world.players) { ++ for (EntityPlayer player : (List) MinecraftServer.getServer().getPlayerList().players) { + double deltaX = this.locX - player.locX; + double deltaZ = this.locZ - player.locZ; + double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; diff --git a/nms-patches/EntityWither.patch b/nms-patches/EntityWither.patch index 36b72db3..9410baa6 100644 --- a/nms-patches/EntityWither.patch +++ b/nms-patches/EntityWither.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/EntityWither.java 2015-02-26 22:40:22.727608138 +0000 -+++ src/main/java/net/minecraft/server/EntityWither.java 2015-02-26 22:40:22.727608138 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/EntityWither.java 2015-03-07 15:02:37.910567217 +0000 ++++ src/main/java/net/minecraft/server/EntityWither.java 2015-03-07 15:02:37.910567217 +0000 @@ -5,6 +5,12 @@ import java.util.Iterator; import java.util.List; @@ -32,7 +32,7 @@ + // CraftBukkit start - Use relative location for far away sounds + // this.world.a(1013, new BlockPosition(this), 0); + int viewDistance = ((WorldServer) this.world).getServer().getViewDistance() * 16; -+ for (EntityPlayer player : (List) (List) this.world.players) { ++ for (EntityPlayer player : (List) MinecraftServer.getServer().getPlayerList().players) { + double deltaX = this.locX - player.locX; + double deltaZ = this.locZ - player.locZ; + double distanceSquared = deltaX * deltaX + deltaZ * deltaZ; -- cgit v1.2.3