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

Update to latest CB

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-07-19 19:35:01 +10:00
parent 76d133d561
commit 087a8e7927
7 changed files with 15 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,22 +1,22 @@
From 41deff2d75cd3ee5da3a104b05d964a8d77736dd Mon Sep 17 00:00:00 2001
From f7d44988922838f78b93465580dc27ec4e8067bb 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 d4bd4ed..0653ff2 100644
index 9c737ec..ee1ce90 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1421,6 +1421,7 @@ public abstract class Entity {
pluginManager.callEvent(event);
@@ -1427,6 +1427,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;
@@ -1438,6 +1439,17 @@ public abstract class Entity {
@@ -1462,6 +1463,17 @@ public abstract class Entity {
}
}
// CraftBukkit end
@@ -35,7 +35,7 @@ index d4bd4ed..0653ff2 100644
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 963bc55..204ee9d 100644
index e1a3ca1..adb27d8 100644
--- a/src/main/java/net/minecraft/server/EntityHuman.java
+++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -304,6 +304,7 @@ public abstract class EntityHuman extends EntityLiving implements ICommandListen
@@ -43,9 +43,9 @@ index 963bc55..204ee9d 100644
// CraftBukkit end
if (this.vehicle != null && entity == null) {
+ world.getServer().getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
if (!this.world.isStatic) {
this.l(this.vehicle);
}
// 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.8.1.2