testserver/CraftBukkit-Patches/0034-Entity-Mount-and-Dismo...

41 lines
1.7 KiB
Diff
Raw Normal View History

2015-02-28 11:36:22 +00:00
From b52a30de982b0edca30416c5075cc4228fb76cf2 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
2015-02-28 11:36:22 +00:00
index ebdcaab..5cf3833 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
2015-02-28 11:36:22 +00:00
@@ -1540,6 +1540,7 @@ public abstract class Entity implements ICommandListener {
}
}
// CraftBukkit end
+ pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
2014-11-28 01:17:45 +00:00
this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
this.vehicle.passenger = null;
2014-11-28 01:17:45 +00:00
}
2015-02-28 11:36:22 +00:00
@@ -1574,6 +1575,18 @@ public abstract class Entity implements ICommandListener {
}
}
// CraftBukkit end
+ // Spigot Start
2014-11-28 01:17:45 +00:00
+ if ( entity.world.isChunkLoaded( (int) entity.locX >> 4, (int) entity.locZ >> 4, true ) )
+ {
+ 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 01:17:45 +00:00
+
if (this.vehicle != null) {
this.vehicle.passenger = null;
2014-11-28 01:17:45 +00:00
}
--
2014-11-28 01:17:45 +00:00
2.1.0