diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 16:38:16 +0000 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2014-12-02 16:38:16 +0000 |
| commit | 0429c76df6a869a8602a1e20c36acc10a7199675 (patch) | |
| tree | d8e5d2b1f5f4ab5ed5dce3ba4920fb3264158df0 /nms-patches | |
| parent | 2b61a04e36f836526687f68477f286dce678025b (diff) | |
| download | craftbukkit-0429c76df6a869a8602a1e20c36acc10a7199675.tar craftbukkit-0429c76df6a869a8602a1e20c36acc10a7199675.tar.gz craftbukkit-0429c76df6a869a8602a1e20c36acc10a7199675.tar.lz craftbukkit-0429c76df6a869a8602a1e20c36acc10a7199675.tar.xz craftbukkit-0429c76df6a869a8602a1e20c36acc10a7199675.zip | |
Fix a missed case for weather transitions on join
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/PlayerList.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch index 886d3b3d..bcf8056c 100644 --- a/nms-patches/PlayerList.patch +++ b/nms-patches/PlayerList.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde//net/minecraft/server/PlayerList.java 2014-11-28 17:43:43.333707430 +0000 -+++ src/main/java/net/minecraft/server/PlayerList.java 2014-11-28 17:38:17.000000000 +0000 +--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerList.java 2014-12-02 16:38:08.513921921 +0000 ++++ src/main/java/net/minecraft/server/PlayerList.java 2014-12-02 16:37:39.357922568 +0000 @@ -18,6 +18,25 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -711,7 +711,7 @@ if (entityplayer != entityhuman && entityplayer.dimension == i) { double d4 = d0 - entityplayer.locX; double d5 = d1 - entityplayer.locY; -@@ -634,21 +981,25 @@ +@@ -634,21 +981,26 @@ public void reloadWhitelist() {} public void b(EntityPlayer entityplayer, WorldServer worldserver) { @@ -729,6 +729,7 @@ + // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(7, worldserver.j(1.0F))); + // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(8, worldserver.h(1.0F))); + entityplayer.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false); ++ entityplayer.updateWeather(-worldserver.p, worldserver.p, -worldserver.r, worldserver.r); + // CraftBukkit end } @@ -742,7 +743,7 @@ entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex)); } -@@ -661,7 +1012,7 @@ +@@ -661,7 +1013,7 @@ } public String[] getSeenPlayers() { @@ -751,7 +752,7 @@ } public boolean getHasWhitelist() { -@@ -711,10 +1062,17 @@ +@@ -711,10 +1063,17 @@ public void v() { for (int i = 0; i < this.players.size(); ++i) { @@ -770,7 +771,7 @@ public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) { this.server.sendMessage(ichatbasecomponent); -@@ -754,11 +1112,10 @@ +@@ -754,11 +1113,10 @@ public void a(int i) { this.r = i; if (this.server.worldServer != null) { |