diff options
| author | md_5 <git@md-5.net> | 2015-02-20 15:37:17 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-02-20 15:37:17 +1100 |
| commit | 1d63ff0d9b6a3904d10e673c440a77b9c5424db3 (patch) | |
| tree | 42a21cbfeefce9b44618f699c3f68a4435bf29cc /nms-patches | |
| parent | b6e327256ca1e852d62c6f383b2fa9f4c772a86f (diff) | |
| download | craftbukkit-1d63ff0d9b6a3904d10e673c440a77b9c5424db3.tar craftbukkit-1d63ff0d9b6a3904d10e673c440a77b9c5424db3.tar.gz craftbukkit-1d63ff0d9b6a3904d10e673c440a77b9c5424db3.tar.lz craftbukkit-1d63ff0d9b6a3904d10e673c440a77b9c5424db3.tar.xz craftbukkit-1d63ff0d9b6a3904d10e673c440a77b9c5424db3.zip | |
SPIGOT-447: Fix dismount causing a quick remount
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/EntityPlayer.patch | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch index fa7e23bc..f10389d2 100644 --- a/nms-patches/EntityPlayer.patch +++ b/nms-patches/EntityPlayer.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/EntityPlayer.java 2015-01-09 16:51:30.962362579 +1100 -+++ src/main/java/net/minecraft/server/EntityPlayer.java 2015-01-09 16:51:30.962362579 +1100 +--- ../work/decompile-8eb82bde/net/minecraft/server/EntityPlayer.java 2015-02-20 15:35:53.244364933 +1100 ++++ src/main/java/net/minecraft/server/EntityPlayer.java 2015-02-20 15:35:53.248364925 +1100 @@ -13,6 +13,17 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -289,6 +289,15 @@ if (this.isSleeping()) { this.u().getTracker().sendPacketToEntity(this, new PacketPlayOutAnimation(this, 2)); } +@@ -457,7 +569,7 @@ + Entity entity1 = this.vehicle; + + super.mount(entity); +- if (entity != entity1) { ++ if (this.vehicle != entity1) { // CraftBukkit + this.playerConnection.sendPacket(new PacketPlayOutAttachEntity(0, this, this.vehicle)); + this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch); + } @@ -490,19 +602,46 @@ this.playerConnection.sendPacket(new PacketPlayOutOpenSignEditor(tileentitysign.getPosition())); } |