Upstream merge

By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-12-10 09:36:25 +11:00
parent 17ee35372b
commit 4761aaf833
4 changed files with 6 additions and 28 deletions

View File

@@ -1,14 +1,14 @@
From 53470d677dd3e38c6bebf68c9fc8484894c3ec07 Mon Sep 17 00:00:00 2001
From 81e0c28d1d10bca5fe94f73c337ef54f700c4bc6 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 621e6c2..3450502 100644
index 6ccba9f..b18d34b 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 {
@@ -1451,6 +1451,7 @@ public abstract class Entity {
}
}
// CraftBukkit end
@@ -16,7 +16,7 @@ index 621e6c2..3450502 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 {
@@ -1486,6 +1487,17 @@ public abstract class Entity {
}
}
// CraftBukkit end