From f718f4dbd7901a9d1ad9f6bc0cc4819cdadd0742 Mon Sep 17 00:00:00 2001 From: Aikar Date: Sun, 3 Apr 2016 19:11:25 -0400 Subject: [PATCH] Fix errorneous call of EntityDismountEvent --- .../Made-EntityDismountEvent-Cancellable.patch | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/Spigot-Server-Patches/Made-EntityDismountEvent-Cancellable.patch b/Spigot-Server-Patches/Made-EntityDismountEvent-Cancellable.patch index f94d55db9..954e9661a 100644 --- a/Spigot-Server-Patches/Made-EntityDismountEvent-Cancellable.patch +++ b/Spigot-Server-Patches/Made-EntityDismountEvent-Cancellable.patch @@ -8,22 +8,13 @@ diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/ index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java -@@ -0,0 +0,0 @@ import org.bukkit.craftbukkit.event.CraftEventFactory; - import org.bukkit.event.entity.EntityCombustEvent; - import org.bukkit.event.entity.EntityPortalEvent; - import org.bukkit.plugin.PluginManager; -+import org.spigotmc.event.entity.EntityDismountEvent; - // CraftBukkit end - - public abstract class Entity implements ICommandListener { @@ -0,0 +0,0 @@ public abstract class Entity implements ICommandListener { + } } // CraftBukkit end - Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot +- Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot + // Paper start - make EntityDismountEvent cancellable -+ EntityDismountEvent dismountEvent = new EntityDismountEvent(this.getBukkitEntity(), entity.getBukkitEntity()); // Spigot -+ Bukkit.getPluginManager().callEvent(dismountEvent); -+ if (dismountEvent.isCancelled()) return; ++ if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) return; + // Paper end this.passengers.remove(entity); entity.j = 60;