summaryrefslogtreecommitdiffstats
path: root/nms-patches
diff options
context:
space:
mode:
authorThinkofdeath <thinkofdeath@spigotmc.org>2015-01-04 20:00:42 +0000
committerThinkofdeath <thinkofdeath@spigotmc.org>2015-01-04 20:00:42 +0000
commita28895313cc8c20c15733bc25c8e6a90c937b0cb (patch)
treed83cdc2bc68c559c2b017a30921928dd629806fa /nms-patches
parentff66a9a65cc0cccafe671d5ae91cdd8017a13c4e (diff)
downloadcraftbukkit-a28895313cc8c20c15733bc25c8e6a90c937b0cb.tar
craftbukkit-a28895313cc8c20c15733bc25c8e6a90c937b0cb.tar.gz
craftbukkit-a28895313cc8c20c15733bc25c8e6a90c937b0cb.tar.lz
craftbukkit-a28895313cc8c20c15733bc25c8e6a90c937b0cb.tar.xz
craftbukkit-a28895313cc8c20c15733bc25c8e6a90c937b0cb.zip
SPIGOT-217: Fix VehicleBlockCollisionEvent having the wrong block location
Diffstat (limited to 'nms-patches')
-rw-r--r--nms-patches/Entity.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/nms-patches/Entity.patch b/nms-patches/Entity.patch
index 478fbbbb..44025a59 100644
--- a/nms-patches/Entity.patch
+++ b/nms-patches/Entity.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/Entity.java Sun Dec 21 17:29:15 2014
-+++ src/main/java/net/minecraft/server/Entity.java Sun Dec 21 17:29:15 2014
+--- ../work/decompile-8eb82bde//net/minecraft/server/Entity.java 2015-01-04 20:00:32.717671452 +0000
++++ src/main/java/net/minecraft/server/Entity.java 2015-01-04 20:00:32.721671452 +0000
@@ -6,8 +6,40 @@
import java.util.UUID;
import java.util.concurrent.Callable;
@@ -161,7 +161,7 @@
+ // CraftBukkit start
+ if (positionChanged && getBukkitEntity() instanceof Vehicle) {
+ Vehicle vehicle = (Vehicle) this.getBukkitEntity();
-+ org.bukkit.block.Block bl = this.world.getWorld().getBlockAt(MathHelper.floor(this.locX), MathHelper.floor(this.locY - (double) this.getHeadHeight()), MathHelper.floor(this.locZ));
++ org.bukkit.block.Block bl = this.world.getWorld().getBlockAt(MathHelper.floor(this.locX), MathHelper.floor(this.locY), MathHelper.floor(this.locZ));
+
+ if (d6 > d0) {
+ bl = bl.getRelative(BlockFace.EAST);