diff options
author | md_5 <git@md-5.net> | 2016-11-30 09:16:01 +1100 |
---|---|---|
committer | md_5 <git@md-5.net> | 2016-11-30 09:16:01 +1100 |
commit | 8d7e4d17e995d5110deb66601ddba9f8b9da1bf5 (patch) | |
tree | 26acb80561e272dad2fce56f6ccfda48647aea37 /nms-patches | |
parent | ff324aabe691dc9f20d89037180d085dfb3a4fd0 (diff) | |
download | craftbukkit-8d7e4d17e995d5110deb66601ddba9f8b9da1bf5.tar craftbukkit-8d7e4d17e995d5110deb66601ddba9f8b9da1bf5.tar.gz craftbukkit-8d7e4d17e995d5110deb66601ddba9f8b9da1bf5.tar.lz craftbukkit-8d7e4d17e995d5110deb66601ddba9f8b9da1bf5.tar.xz craftbukkit-8d7e4d17e995d5110deb66601ddba9f8b9da1bf5.zip |
Expand definition of isFrozen
Diffstat (limited to 'nms-patches')
-rw-r--r-- | nms-patches/EntityPlayer.patch | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch index 992541a6..508b23e5 100644 --- a/nms-patches/EntityPlayer.patch +++ b/nms-patches/EntityPlayer.patch @@ -419,24 +419,23 @@ this.playerConnection.sendPacket(new PacketPlayOutCloseWindow(this.activeContainer.windowId)); this.s(); } -@@ -743,8 +906,17 @@ +@@ -743,7 +906,16 @@ public void triggerHealthUpdate() { this.lastHealthSent = -1.0E8F; + this.lastSentExp = -1; // CraftBukkit - Added to reset - } - ++ } ++ + // CraftBukkit start - Support multi-line messages + public void sendMessage(IChatBaseComponent[] ichatbasecomponent) { + for (IChatBaseComponent component : ichatbasecomponent) { + this.sendMessage(component); + } -+ } + } + // CraftBukkit end -+ + public void a(IChatBaseComponent ichatbasecomponent, boolean flag) { this.playerConnection.sendPacket(new PacketPlayOutChat(ichatbasecomponent, (byte) (flag ? 2 : 0))); - } @@ -804,6 +976,8 @@ } @@ -500,7 +499,7 @@ } public void a(EnumHand enumhand) { -@@ -958,11 +1149,145 @@ +@@ -958,11 +1149,150 @@ } public void M() { @@ -609,6 +608,11 @@ + this.playerConnection.syncPosition(); + } + ++ @Override ++ protected boolean isFrozen() { ++ return super.isFrozen() || !getBukkitEntity().isOnline(); ++ } ++ + public void reset() { + float exp = 0; + boolean keepInventory = this.world.getGameRules().getBoolean("keepInventory"); |