summaryrefslogtreecommitdiffstats
path: root/nms-patches/PlayerList.patch
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-06 16:25:50 +1100
committermd_5 <git@md-5.net>2016-03-06 16:25:50 +1100
commit23a94053b049c23ac77ac57fea30891e11fd99f6 (patch)
treef7ef42a3ec7692218f97f5244e64e5d813b2f053 /nms-patches/PlayerList.patch
parentdd745e8842fc488081ee03b73b1ace4707c2cde1 (diff)
downloadcraftbukkit-23a94053b049c23ac77ac57fea30891e11fd99f6.tar
craftbukkit-23a94053b049c23ac77ac57fea30891e11fd99f6.tar.gz
craftbukkit-23a94053b049c23ac77ac57fea30891e11fd99f6.tar.lz
craftbukkit-23a94053b049c23ac77ac57fea30891e11fd99f6.tar.xz
craftbukkit-23a94053b049c23ac77ac57fea30891e11fd99f6.zip
Remove redundant syncInventory on world change
Diffstat (limited to 'nms-patches/PlayerList.patch')
-rw-r--r--nms-patches/PlayerList.patch3
1 files changed, 2 insertions, 1 deletions
diff --git a/nms-patches/PlayerList.patch b/nms-patches/PlayerList.patch
index 9af00a61..80e7bd83 100644
--- a/nms-patches/PlayerList.patch
+++ b/nms-patches/PlayerList.patch
@@ -473,13 +473,14 @@
- worldserver.addEntity(entityplayer1);
- this.players.add(entityplayer1);
- this.j.put(entityplayer1.getUniqueID(), entityplayer1);
+- entityplayer1.syncInventory();
+ if (!entityplayer.playerConnection.isDisconnected()) {
+ worldserver.getPlayerChunkMap().addPlayer(entityplayer1);
+ worldserver.addEntity(entityplayer1);
+ this.players.add(entityplayer1);
+ this.j.put(entityplayer1.getUniqueID(), entityplayer1);
+ }
- entityplayer1.syncInventory();
++ // entityplayer1.syncInventory();
entityplayer1.setHealth(entityplayer1.getHealth());
+ // Added from changeDimension
+ updateClient(entityplayer); // Update health, etc...