From 5be55c33e4dc532e097218d37110f256dcbfafa5 Mon Sep 17 00:00:00 2001
From: Zach Brown <zach.brown@destroystokyo.com>
Date: Sun, 25 Oct 2015 17:12:43 -0500
Subject: [PATCH] SPIGOT-596: Fix EntityDismountEvent

---
 .../0033-Entity-Mount-and-Dismount-Events.patch  | 16 ++++++++++++++--
 ...ize-the-isDisconnected-method-by-bukkit.patch |  8 ++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
index 6969d336e0..8eaa98f280 100644
--- a/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
+++ b/CraftBukkit-Patches/0033-Entity-Mount-and-Dismount-Events.patch
@@ -1,4 +1,4 @@
-From b6dc057e61c507292b951a417232c665734cbe0b Mon Sep 17 00:00:00 2001
+From 0f04f35d6d781efc9d91d42c47c05ba41598de43 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Tue, 2 Jul 2013 20:32:49 +1000
 Subject: [PATCH] Entity Mount and Dismount Events
@@ -35,6 +35,18 @@ index 2f386ac..bf3ce15 100644
              if (this.vehicle != null) {
                  this.vehicle.passenger = null;
              }
+diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+index bd30895..b42cd36 100644
+--- a/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/server/EntityLiving.java
+@@ -1709,6 +1709,7 @@ public abstract class EntityLiving extends Entity {
+                 }
+             }
+             // CraftBukkit end
++            org.bukkit.Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
+             
+             if (!this.world.isClientSide) {
+                 this.q(this.vehicle);
 -- 
-2.1.4
+2.6.2
 
diff --git a/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch
index ce4a79f9aa..a28a6bfdd1 100644
--- a/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch
+++ b/CraftBukkit-Patches/0086-Unfinalize-the-isDisconnected-method-by-bukkit.patch
@@ -1,4 +1,4 @@
-From 30e4c3b9c991462e070d81c0e3fd15c7775adaac Mon Sep 17 00:00:00 2001
+From 93af51933eb01ccbcd423a34ee958eb1dca54cfb Mon Sep 17 00:00:00 2001
 From: hcherndon <hcherndon@gmail.com>
 Date: Sat, 15 Feb 2014 01:51:20 -0600
 Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
@@ -6,10 +6,10 @@ Subject: [PATCH] Unfinalize the isDisconnected() method by bukkit.
 This would literally mean the world to me. You have no idea how much this method being final is fucking me over right now. (Working with NPC's and what not.)
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 1d9bfe4..952b8a2 100644
+index b1b8a2f..0f2908e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2087,7 +2087,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+@@ -2095,7 +2095,7 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
      }
  
      // CraftBukkit start - Add "isDisconnected" method
@@ -19,5 +19,5 @@ index 1d9bfe4..952b8a2 100644
      }
  
 -- 
-2.1.4
+2.5.0