40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
|
From 19fdd2e4302b1bc3be272274ee6e77a389d7bb44 Mon Sep 17 00:00:00 2001
|
||
|
|
From: md_5 <md_5@live.com.au>
|
||
|
|
Date: Tue, 2 Jul 2013 20:32:49 +1000
|
||
|
|
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 700e450..ea6762e 100644
|
||
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
||
|
|
@@ -1413,6 +1413,7 @@ public abstract class Entity {
|
||
|
|
if ((this.bukkitEntity instanceof LivingEntity) && (this.vehicle.getBukkitEntity() instanceof Vehicle)) {
|
||
|
|
VehicleExitEvent event = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
|
||
|
|
pluginManager.callEvent(event);
|
||
|
|
+ pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), entity.getBukkitEntity() ) ); // Spigot
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
|
||
|
|
@@ -1432,6 +1433,17 @@ public abstract class Entity {
|
||
|
|
}
|
||
|
|
}
|
||
|
|
// CraftBukkit end
|
||
|
|
+ // Spigot Start
|
||
|
|
+ if ( entity.world.isChunkLoaded( (int) entity.locX >> 4, (int) entity.locZ >> 4 ) )
|
||
|
|
+ {
|
||
|
|
+ org.spigotmc.event.entity.EntityMountEvent event = new org.spigotmc.event.entity.EntityMountEvent( this.getBukkitEntity(), entity.getBukkitEntity() );
|
||
|
|
+ pluginManager.callEvent( event );
|
||
|
|
+ if ( event.isCancelled() )
|
||
|
|
+ {
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+ }
|
||
|
|
+ // Spigot End
|
||
|
|
|
||
|
|
if (this.vehicle != null) {
|
||
|
|
this.vehicle.passenger = null;
|
||
|
|
--
|
||
|
|
1.8.1.2
|
||
|
|
|