testserver/Spigot-Server-Patches/0060-Made-EntityDismountEve...

25 lines
1.1 KiB
Diff
Raw Normal View History

From 5c4d7d8d8e6ff1d01202e5de62da63fe66c55c96 Mon Sep 17 00:00:00 2001
2016-02-29 23:09:49 +00:00
From: Nik Gil <nikmanG@users.noreply.github.com>
2016-03-03 09:46:26 +00:00
Date: Thu, 3 Mar 2016 04:04:19 -0600
2016-02-29 23:09:49 +00:00
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..c3e6588 100644
2016-02-29 23:09:49 +00:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1741,7 +1741,9 @@ public abstract class Entity implements ICommandListener {
}
2016-02-29 23:09:49 +00:00
}
// CraftBukkit end
- Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
2016-02-29 23:09:49 +00:00
+ // Paper start - make EntityDismountEvent cancellable
+ if (!new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity()).callEvent()) return;
2016-02-29 23:09:49 +00:00
+ // Paper end
this.passengers.remove(entity);
entity.j = 60;
}
--
2016-03-31 00:50:23 +00:00
2.8.0
2016-02-29 23:09:49 +00:00