Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-30 14:33:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix a missed case for weather transitions on join

Browse Source
This commit is contained in:
Thinkofdeath 2014-12-02 16:38:16 +00:00
parent 2b61a04e36
commit 0429c76df6
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nms-patches/PlayerList.patch
View File

@ -1,5 +1,5 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/PlayerList.java 2014-11-28 17:43:43.333707430 +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-11-28 17:38:17.000000000 +0000 +++ src/main/java/net/minecraft/server/PlayerList.java 2014-12-02 16:37:39.357922568 +0000
@@ -18,6 +18,25 @@ @@ -18,6 +18,25 @@
import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.Logger;
@ -711,7 +711,7 @@
if (entityplayer != entityhuman && entityplayer.dimension == i) { if (entityplayer != entityhuman && entityplayer.dimension == i) {
double d4 = d0 - entityplayer.locX; double d4 = d0 - entityplayer.locX;
double d5 = d1 - entityplayer.locY; double d5 = d1 - entityplayer.locY;
@@ -634,21 +981,25 @@ @@ -634,21 +981,26 @@
public void reloadWhitelist() {} public void reloadWhitelist() {}
public void b(EntityPlayer entityplayer, WorldServer worldserver) { 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(7, worldserver.j(1.0F)));
+ // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(8, worldserver.h(1.0F))); + // entityplayer.playerConnection.sendPacket(new PacketPlayOutGameStateChange(8, worldserver.h(1.0F)));
+ entityplayer.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false); + entityplayer.setPlayerWeather(org.bukkit.WeatherType.DOWNFALL, false);
+ entityplayer.updateWeather(-worldserver.p, worldserver.p, -worldserver.r, worldserver.r);
+ // CraftBukkit end + // CraftBukkit end
} }
@ -742,7 +743,7 @@
entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex)); entityplayer.playerConnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
} }
@@ -661,7 +1012,7 @@ @@ -661,7 +1013,7 @@
} }
public String[] getSeenPlayers() { public String[] getSeenPlayers() {
@ -751,7 +752,7 @@
} }
public boolean getHasWhitelist() { public boolean getHasWhitelist() {
@@ -711,10 +1062,17 @@ @@ -711,10 +1063,17 @@
public void v() { public void v() {
for (int i = 0; i < this.players.size(); ++i) { for (int i = 0; i < this.players.size(); ++i) {
@ -770,7 +771,7 @@
public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) { public void sendMessage(IChatBaseComponent ichatbasecomponent, boolean flag) {
this.server.sendMessage(ichatbasecomponent); this.server.sendMessage(ichatbasecomponent);
@@ -754,11 +1112,10 @@ @@ -754,11 +1113,10 @@
public void a(int i) { public void a(int i) {
this.r = i; this.r = i;
if (this.server.worldServer != null) { if (this.server.worldServer != null) {