33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
From 3034ddd456b81eafd9a8ef34f9dfa72d8f6243af Mon Sep 17 00:00:00 2001
|
|
From: Nik Gil <nikmanG@users.noreply.github.com>
|
|
Date: Thu, 3 Mar 2016 04:04:19 -0600
|
|
Subject: [PATCH] Made EntityDismountEvent Cancellable
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
|
index 782abd6..51b2a4f 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -38,6 +38,7 @@ 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 {
|
|
@@ -1742,6 +1743,11 @@ public abstract class Entity implements ICommandListener {
|
|
}
|
|
// CraftBukkit end
|
|
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;
|
|
+ // Paper end
|
|
this.passengers.remove(entity);
|
|
entity.j = 60;
|
|
}
|
|
--
|
|
2.8.0
|
|
|