diff options
Diffstat (limited to 'Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch')
-rw-r--r-- | Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch b/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch index bae6c970a0..e3aabb05d7 100644 --- a/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch +++ b/Spigot-Server-Patches/0123-Vehicle-Event-Cancellation-Changes.patch @@ -1,11 +1,11 @@ -From 6019d4c635401d142da1f6a03287e936109deb9f Mon Sep 17 00:00:00 2001 +From 2ca1f747abed74dc85b59b9688dd3ef238d3774c Mon Sep 17 00:00:00 2001 From: Zach Brown <[email protected]> Date: Fri, 22 Apr 2016 18:20:05 -0500 Subject: [PATCH] Vehicle Event Cancellation Changes diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java -index ae6638d..0818ff8 100644 +index 8908d8b8d..0f4a1b66b 100644 --- a/src/main/java/net/minecraft/server/Entity.java +++ b/src/main/java/net/minecraft/server/Entity.java @@ -70,7 +70,7 @@ public abstract class Entity implements ICommandListener { @@ -17,7 +17,7 @@ index ae6638d..0818ff8 100644 public boolean attachedToPlayer; public World world; public double lastX; -@@ -1880,6 +1880,7 @@ public abstract class Entity implements ICommandListener { +@@ -1928,6 +1928,7 @@ public abstract class Entity implements ICommandListener { throw new IllegalStateException("Use x.stopRiding(y), not y.removePassenger(x)"); } else { // CraftBukkit start @@ -25,7 +25,7 @@ index ae6638d..0818ff8 100644 CraftEntity craft = (CraftEntity) entity.getBukkitEntity().getVehicle(); Entity orig = craft == null ? null : craft.getHandle(); if (getBukkitEntity() instanceof Vehicle && entity.getBukkitEntity() instanceof LivingEntity) { -@@ -1895,7 +1896,13 @@ public abstract class Entity implements ICommandListener { +@@ -1943,7 +1944,13 @@ public abstract class Entity implements ICommandListener { } } // CraftBukkit end @@ -41,5 +41,5 @@ index ae6638d..0818ff8 100644 entity.j = 60; } -- -2.9.3 +2.12.0.windows.1 |