2015-02-26 11:40:16 +01:00
|
|
|
From 6c0d9ff5e5043eccd210f7f838a9ad0c80e57f77 Mon Sep 17 00:00:00 2001
|
2014-07-21 22:46:54 +02:00
|
|
|
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
|
2015-01-12 01:38:47 +01:00
|
|
|
index 9dcddb1..8f7d865 100644
|
2014-07-21 22:46:54 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
2015-01-12 01:38:47 +01:00
|
|
|
@@ -1537,6 +1537,7 @@ public abstract class Entity implements ICommandListener {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
+ pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
|
2014-11-28 02:17:45 +01:00
|
|
|
this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
|
2014-07-21 22:46:54 +02:00
|
|
|
this.vehicle.passenger = null;
|
2014-11-28 02:17:45 +01:00
|
|
|
}
|
2015-01-12 01:38:47 +01:00
|
|
|
@@ -1571,6 +1572,18 @@ public abstract class Entity implements ICommandListener {
|
2014-07-21 22:46:54 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
// CraftBukkit end
|
|
|
|
+ // Spigot Start
|
2014-11-28 02:17:45 +01:00
|
|
|
+ if ( entity.world.isChunkLoaded( (int) entity.locX >> 4, (int) entity.locZ >> 4, true ) )
|
2014-07-21 22:46:54 +02:00
|
|
|
+ {
|
|
|
|
+ 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
|
2014-11-28 02:17:45 +01:00
|
|
|
+
|
2014-07-21 22:46:54 +02:00
|
|
|
if (this.vehicle != null) {
|
|
|
|
this.vehicle.passenger = null;
|
2014-11-28 02:17:45 +01:00
|
|
|
}
|
2014-07-21 22:46:54 +02:00
|
|
|
--
|
2014-11-28 02:17:45 +01:00
|
|
|
2.1.0
|
2014-07-21 22:46:54 +02:00
|
|
|
|