Fix incorrect check on vehicle for auto dismount

This fixes an issue where players are dismounted from their horse on logout.
This commit is contained in:
Aikar 2019-02-28 02:43:38 -05:00
parent 2f8bdbfde8
commit 3ab6da0e4f
No known key found for this signature in database
GPG Key ID: 401ADFC9891FAAFE

View File

@ -1,11 +1,11 @@
From e262239a6dbe5860f2a3172d3eeb5ec57b629941 Mon Sep 17 00:00:00 2001
From 53659657d97290f811c4da3416173e58e13e727b 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
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