diff options
author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-12 16:45:42 -0600 |
---|---|---|
committer | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-13 13:29:32 -0600 |
commit | cebc247b78e14c7bc236d69010e1000d53be28ef (patch) | |
tree | a54345c2058257476570d19aba1572955c9da659 /src/main/java/net/minecraft/server/EntityPlayer.java | |
parent | 67f15266dae4d2963d5351fb20f40de63acd721e (diff) | |
download | craftbukkit-cebc247b78e14c7bc236d69010e1000d53be28ef.tar craftbukkit-cebc247b78e14c7bc236d69010e1000d53be28ef.tar.gz craftbukkit-cebc247b78e14c7bc236d69010e1000d53be28ef.tar.lz craftbukkit-cebc247b78e14c7bc236d69010e1000d53be28ef.tar.xz craftbukkit-cebc247b78e14c7bc236d69010e1000d53be28ef.zip |
Correctly fire VehicleExitEvent. Fixes BUKKIT-3761
This change makes it so that EntityHuman#setPassengerOf(Entity) invokes
its parent method when leaving vehicles so that VehicleExitEvent is fired
for players leaving vehicles.
This change also fixes BUKKIT-2110, making it so VehicleExitEvent
correctly handles cancellation. The implementation of VehicleExitEvent
completely ignored the cancellation state of the event, making it so that
cancelling the event had no effect. Cancelling a VehicleExitEvent now
causes the entity to remain inside of the vehicle, with no visual stutter.
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityPlayer.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityPlayer.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java index 2191b075..955b75c3 100644 --- a/src/main/java/net/minecraft/server/EntityPlayer.java +++ b/src/main/java/net/minecraft/server/EntityPlayer.java @@ -461,12 +461,16 @@ public class EntityPlayer extends EntityHuman implements ICrafting { public void setPassengerOf(Entity entity) { // mount(null) doesn't really fly for overloaded methods, // so this method is needed + Entity currentVehicle = this.vehicle; super.setPassengerOf(entity); - // CraftBukkit end - this.playerConnection.sendPacket(new Packet39AttachEntity(0, this, this.vehicle)); - this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch); + // Check if the vehicle actually changed. + if (currentVehicle != this.vehicle) { + this.playerConnection.sendPacket(new Packet39AttachEntity(0, this, this.vehicle)); + this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch); + } + // CraftBukkit end } protected void a(double d0, boolean flag) {} |