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-01-31 20:42:29 +00:00
parent 161ec4151b
commit 99ececedb4
23 changed files with 113 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CraftBukkit-Patches/0043-Entity-Mount-and-Dismount-Events.patch
View File

@@ -1,14 +1,14 @@
From ff8ebc0965a86af74237fb0c55c32e6b2e55c7d2 Mon Sep 17 00:00:00 2001
From ba520c2a1112cd05f754cb7d3d0cc7c4339db980 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 a3a8750..9ef9f88 100644
index 43fee78..d8d5739 100644
--- a/src/main/java/net/minecraft/server/Entity.java
+++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1451,6 +1451,7 @@ public abstract class Entity {
@@ -1452,6 +1452,7 @@ public abstract class Entity {
}
}
// CraftBukkit end
@@ -16,7 +16,7 @@ index a3a8750..9ef9f88 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;
@@ -1486,6 +1487,17 @@ public abstract class Entity {
@@ -1487,6 +1488,17 @@ public abstract class Entity {
}
}
// CraftBukkit end
@@ -47,5 +47,5 @@ index c12a08f..7442943 100644
Entity originalVehicle = this.vehicle;
// First statement moved down, second statement handled in parent method.
--
1.8.3.2
1.8.4.msysgit.0