89182676ed
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: 9e95da12 SPIGOT-5052: PlayerPortalEvent not called when nether is disabled 28ea3fd1 SPIGOT-5062: end_portal on an non-default end world crashes the server 4a07dc69 SPIGOT-5058: ClassCastException when getting InventoryHolder of lectern when it's destroyed
27 lines
1 KiB
Diff
27 lines
1 KiB
Diff
From e739a82561b4d23437245dd7759d687350aec420 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 60cc81ef77..cce0c30fa3 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1277,6 +1277,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
public void n() {
|
|
this.ct = true;
|
|
this.ejectPassengers();
|
|
+
|
|
+ // Paper start - Workaround an issue where the vehicle doesn't track the passenger disconnection dismount.
|
|
+ if (this.isPassenger() && this.getVehicle() instanceof EntityPlayer) {
|
|
+ this.stopRiding();
|
|
+ }
|
|
+ // Paper end
|
|
+
|
|
if (this.isSleeping()) {
|
|
this.wakeup(true, false, false);
|
|
}
|
|
--
|
|
2.21.0
|
|
|