2014-08-31 18:56:05 +00:00
|
|
|
From eb9ab3071de9fcfaf291a6ac0e86e79833abc238 Mon Sep 17 00:00:00 2001
|
2014-07-21 20:46:54 +00: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
|
|
|
|
|
index 18e4d8d..85d7665 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/Entity.java
|
|
|
|
|
@@ -1450,6 +1450,7 @@ public abstract class Entity {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// CraftBukkit end
|
|
|
|
|
+ pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
|
|
|
|
|
|
|
|
|
|
this.setPositionRotation(this.vehicle.locX, this.vehicle.boundingBox.b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
|
|
|
|
|
this.vehicle.passenger = null;
|
|
|
|
|
@@ -1485,6 +1486,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;
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
|
index 03485fe..54c77f8 100644
|
|
|
|
|
--- a/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
|
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
|
|
|
|
|
@@ -323,6 +323,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
|
|
|
|
|
public void setPassengerOf(Entity entity) {
|
|
|
|
|
// CraftBukkit end
|
|
|
|
|
if (this.vehicle != null && entity == null) {
|
|
|
|
|
+ world.getServer().getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
|
|
|
|
|
// CraftBukkit start - use parent method instead to correctly fire VehicleExitEvent
|
|
|
|
|
Entity originalVehicle = this.vehicle;
|
|
|
|
|
// First statement moved down, second statement handled in parent method.
|
|
|
|
|
--
|
|
|
|
|
1.9.1
|
|
|
|
|
|
