From 3005aa33e0fbd79780c20ce750161c8898eaa8ea Mon Sep 17 00:00:00 2001 From: md_5 Date: Thu, 11 Jul 2013 16:59:26 +1000 Subject: [PATCH] Add additional case for EntityDismountEvent --- .../0058-Entity-Mount-and-Dismount-Events.patch | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch index 2e2cc93beb..b849f2a230 100644 --- a/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch +++ b/CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch @@ -1,4 +1,4 @@ -From 71db09c44555124b2a17045ad4ee0151b7ad6551 Mon Sep 17 00:00:00 2001 +From 41deff2d75cd3ee5da3a104b05d964a8d77736dd Mon Sep 17 00:00:00 2001 From: md_5 Date: Tue, 2 Jul 2013 20:32:49 +1000 Subject: [PATCH] Entity Mount and Dismount Events @@ -34,6 +34,18 @@ index d4bd4ed..0653ff2 100644 if (this.vehicle != null) { this.vehicle.passenger = null; +diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java +index 963bc55..204ee9d 100644 +--- a/src/main/java/net/minecraft/server/EntityHuman.java ++++ b/src/main/java/net/minecraft/server/EntityHuman.java +@@ -304,6 +304,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen + public void setPassengerOf(Entity entity) { + // CraftBukkit end + if (this.vehicle != null && entity == null) { ++ world.getServer().getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot + if (!this.world.isStatic) { + this.l(this.vehicle); + } -- 1.8.1.2