36 lines
1.5 KiB
Diff
36 lines
1.5 KiB
Diff
|
From dff771cb23a66e9f7681e33108bcc7c7be1e9be9 Mon Sep 17 00:00:00 2001
|
||
|
|
From: md_5 <git@md-5.net>
|
||
|
|
Date: Sat, 27 Feb 2016 10:07:58 +1100
|
||
|
|
Subject: [PATCH] Entity Mount and Dismount Events
|
||
|
|
|
||
|
|
|
||
|
|
diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
index 1817e6d..1eec160 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -1679,6 +1679,13 @@ public abstract class Entity implements ICommandListener {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
+ // Spigot start
|
||
|
|
+ org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent(this.getBukkitEntity(), entity.getBukkitEntity());
|
||
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
||
|
|
+ if (event.isCancelled()) {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ // Spigot end
|
||
|
|
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bt() instanceof EntityHuman)) {
|
||
|
|
this.passengers.add(0, entity);
|
||
|
|
} else {
|
||
|
|
@@ -1708,6 +1715,7 @@ public abstract class Entity implements ICommandListener {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
+ Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), entity.getBukkitEntity() ) ); // Spigot
|
||
|
|
this.passengers.remove(entity);
|
||
|
|
entity.j = 60;
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.5.0
|
||
|
|
|