spigot/CraftBukkit-Patches/0028-Entity-Mount-and-Dismount-Events.patch

36 lines
1.5 KiB
Diff
Raw Normal View History

2018-07-22 12:00:00 +10:00
From 860d9ff29fccf8a4cf62fda4595decc61b59cfba Mon Sep 17 00:00:00 2001
2016-03-01 08:33:06 +11:00
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
2018-07-22 12:00:00 +10:00
index 855f7ff0a..0e90fd362 100644
2016-03-01 08:33:06 +11:00
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2018-07-15 10:00:00 +10:00
@@ -2005,6 +2005,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
2016-03-01 08:33:06 +11:00
}
}
// CraftBukkit end
+ // Spigot start
+ org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent(entity.getBukkitEntity(), this.getBukkitEntity());
2016-03-01 08:33:06 +11:00
+ Bukkit.getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return;
+ }
+ // Spigot end
2018-07-15 10:00:00 +10:00
if (!this.world.isClientSide && entity instanceof EntityHuman && !(this.bO() instanceof EntityHuman)) {
2016-03-01 08:33:06 +11:00
this.passengers.add(0, entity);
} else {
2018-07-15 10:00:00 +10:00
@@ -2034,6 +2041,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
2016-03-01 08:33:06 +11:00
}
}
// CraftBukkit end
+ Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent(entity.getBukkitEntity(), this.getBukkitEntity())); // Spigot
2016-03-01 08:33:06 +11:00
this.passengers.remove(entity);
2018-07-15 10:00:00 +10:00
entity.k = 60;
2016-03-01 08:33:06 +11:00
}
--
2018-07-15 10:00:00 +10:00
2.17.1
2016-03-01 08:33:06 +11:00