diff options
Diffstat (limited to 'patches/server/0763-Friction-API.patch')
| -rw-r--r-- | patches/server/0763-Friction-API.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/server/0763-Friction-API.patch b/patches/server/0763-Friction-API.patch index b2946a72b1..e31a2d2226 100644 --- a/patches/server/0763-Friction-API.patch +++ b/patches/server/0763-Friction-API.patch @@ -110,7 +110,7 @@ index d555fd0b200c012f30ed0c0ec09a37b25a737b76..7a6d51020d9c6be33b4c34c0d6085595 this.discard(null); // CraftBukkit - add Bukkit remove cause } diff --git a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java -index 1fdf2179eb768575fa49c019fb6d81f466892f98..ce91809d66007def728a127a0a9d33f6235cc94d 100644 +index f88c1becd08e7b10f228624160b85f89a379fbeb..cdc8606ffe5c75ee19d92e9f86f26b2a502d765e 100644 --- a/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java +++ b/src/main/java/net/minecraft/world/entity/vehicle/AbstractMinecart.java @@ -93,6 +93,7 @@ public abstract class AbstractMinecart extends VehicleEntity { @@ -221,10 +221,10 @@ index 1ceaa081231a617bd87331b308c24d9c7a8dcf2b..2fd4a3068d86a37cc18c9203448823c5 + // Paper end - friction API } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java -index 8192ccb01ed4efe9e987cab94952c172ed876581..5791f9936532899b337b149a109781fba0819657 100644 +index e02ecbdc158311bdc7e4d13307de6e2a2cf54235..b42bce0c4f4b3aac2729cfdad392d863245ed693 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecart.java -@@ -138,4 +138,18 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart { +@@ -127,4 +127,18 @@ public abstract class CraftMinecart extends CraftVehicle implements Minecart { public int getDisplayBlockOffset() { return this.getHandle().getDisplayOffset(); } |