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

Upstream merge

Browse Source 
By: Thinkofdeath <thethinkofdeath@gmail.com>
This commit is contained in:
Spigot
2014-04-18 17:08:19 +00:00
parent 1f1443ed34
commit 804a818172
17 changed files with 84 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,14 +1,14 @@
From 7057ec11fe46ec66b9d5f35b589a1c762e31a7f6 Mon Sep 17 00:00:00 2001
From ae439b64018d26625c4698357ea2ea8a3bd81cc2 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 621f593..b13968d 100644
index 9179baa..327daae 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1452,6 +1452,7 @@ public abstract class Entity {
@@ -1454,6 +1454,7 @@ public abstract class Entity {
}
}
// CraftBukkit end
@@ -16,7 +16,7 @@ index 621f593..b13968d 100644
this.setPositionRotation(this.vehicle.locX, this.vehicle.boundingBox.b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
this.vehicle.passenger = null;
@@ -1487,6 +1488,17 @@ public abstract class Entity {
@@ -1489,6 +1490,17 @@ public abstract class Entity {
}
}
// CraftBukkit end
@@ -35,7 +35,7 @@ index 621f593..b13968d 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 eb4793d..e2e7b9c 100644
index 381ba31..1fc7a22 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
@@ -47,5 +47,5 @@ index eb4793d..e2e7b9c 100644
Entity originalVehicle = this.vehicle;
// First statement moved down, second statement handled in parent method.
--
1.8.3.2
1.9.1