mirror of
https://hub.spigotmc.org/stash/scm/spigot/spigot.git
synced 2025-08-21 05:54:59 +00:00
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
From 860d9ff29fccf8a4cf62fda4595decc61b59cfba 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 855f7ff0a..0e90fd362 100644
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
@@ -2005,6 +2005,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
|
|
}
|
|
}
|
|
// CraftBukkit end
|
|
+ // Spigot start
|
|
+ org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent(entity.getBukkitEntity(), this.getBukkitEntity());
|
|
+ Bukkit.getPluginManager().callEvent(event);
|
|
+ if (event.isCancelled()) {
|
|
+ return;
|
|
+ }
|
|
+ // Spigot end
|
|
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bO() instanceof EntityHuman)) {
|
|
this.passengers.add(0, entity);
|
|
} else {
|
|
@@ -2034,6 +2041,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
|
|
}
|
|
}
|
|
// CraftBukkit end
|
|
+ Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
|
|
this.passengers.remove(entity);
|
|
entity.k = 60;
|
|
}
|
|
--
|
|
2.17.1
|
|
|