mirror of
https://github.com/PaperMC/Paper.git
synced 2024-08-06 04:03:03 +02:00
1e38743b1d
Also fixes build as a result of an upstream force push --- work/Bukkit Submodule work/Bukkit 217dc08d..d13fdf8c: > SPIGOT-4637: Add source block to BlockPhysicsEvent. --- work/CraftBukkit Submodule work/CraftBukkit acbba8ba..cb98c6ea: > Fix line endings in CraftDefaultPermissions > SPIGOT-4637: Add source block to BlockPhysicsEvent. --- work/Spigot Submodule work/Spigot 75ee78a0c...4165cd8f4 (commits not present) > (Manually Added) - Appears to be a result of an upstream force push > (Manually Added) - Changed: SPIGOT-4636: Add creative mode NBT permissions
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
From e262239a6dbe5860f2a3172d3eeb5ec57b629941 Mon Sep 17 00:00:00 2001
|
|
From: connorhartley <vectrixu+gh@gmail.com>
|
|
Date: Mon, 7 Jan 2019 14:43:48 -0600
|
|
Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
index de17da992..0b7b2c22d 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1113,6 +1113,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
public void n() {
|
|
this.cB = true;
|
|
this.ejectPassengers();
|
|
+
|
|
+ // Paper start - Workaround an issue where the vehicle doesn't track the passenger disconnection dismount.
|
|
+ if (this.isPassenger() && this.getVehicle() instanceof EntityLiving) {
|
|
+ this.stopRiding();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
if (this.sleeping) {
|
|
this.a(true, false, false);
|
|
}
|
|
--
|
|
2.20.1
|
|
|