c4d9cc8318
Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 1b5ad2af SPIGOT-6316: PlayerBedLeaveEvent implements Cancellable CraftBukkit Changes: 058b4df95 SPIGOT-6316: PlayerBedLeaveEvent implements Cancellable
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From 0000000000000000000000000000000000000000 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 a8802c21c4892717730d71b157c0fcf66d86e47e..07fbda110ed1a4f0286fe6352dbe90d54ee680ec 100644
|
|
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
|
|
@@ -1394,6 +1394,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
|
|
public void p() {
|
|
this.ch = 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);
|
|
}
|