SteamWar/Paper
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Always call dismount events regardless of Vehicle or not

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-08 09:21:54 +10:00
parent 9cf9dc4d30
commit e782a92b06
7 changed files with 19 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CraftBukkit-Patches/0058-Entity-Mount-and-Dismount-Events.patch
View File

@@ -1,21 +1,21 @@
From 27928f3910adc76ee6a1b59a7c4d0d9f521260d0 Mon Sep 17 00:00:00 2001
From dc989aecc7c147d1b86e9c92739db6f996c9213a 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 8fbf811..fe0b43a 100644
index 8fbf811..3b1d9e4 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1409,6 +1409,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);
@@ -1411,6 +1411,7 @@ public abstract class Entity {
pluginManager.callEvent(event);
+ pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
}
// 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;
@@ -1428,6 +1429,17 @@ public abstract class Entity {
}
}