papermc/Spigot-Server-Patches/0414-Workaround-for-vehicle-tracking-issue-on-disconnect.patch
Zach Brown 0ecc1545dd
Update upstream CB
--- work/CraftBukkit
Submodule work/CraftBukkit a2dd0e303..51c118b1d:
  > SPIGOT-4619: Incorrect packet order for villager inventories
  > Fix EntityPickupItemEvent getRemaining / PlayerInventory#canHold
2019-02-13 09:07:12 -05:00

27 lines
1 KiB
Diff

From 71f36b2308ade6e4c0080d5b910a2db325f56659 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