From 3ab6da0e4f557b3f7dd7ebd7145863054bc870d2 Mon Sep 17 00:00:00 2001 From: Aikar Date: Thu, 28 Feb 2019 02:43:38 -0500 Subject: [PATCH] Fix incorrect check on vehicle for auto dismount This fixes an issue where players are dismounted from their horse on logout. --- ...orkaround-for-vehicle-tracking-issue-on-disconnect.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch b/Spigot-Server-Patches/0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch index 8b3f164851..c6e2d8be4b 100644 --- a/Spigot-Server-Patches/0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch +++ b/Spigot-Server-Patches/0413-Workaround-for-vehicle-tracking-issue-on-disconnect.patch @@ -1,11 +1,11 @@ -From e262239a6dbe5860f2a3172d3eeb5ec57b629941 Mon Sep 17 00:00:00 2001 +From 53659657d97290f811c4da3416173e58e13e727b Mon Sep 17 00:00:00 2001 From: connorhartley 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 +index de17da9925..010749ddc3 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 { @@ -14,7 +14,7 @@ index de17da992..0b7b2c22d 100644 this.ejectPassengers(); + + // Paper start - Workaround an issue where the vehicle doesn't track the passenger disconnection dismount. -+ if (this.isPassenger() && this.getVehicle() instanceof EntityLiving) { ++ if (this.isPassenger() && this.getVehicle() instanceof EntityPlayer) { + this.stopRiding(); + } + // Paper end