From 7ab4a31c1f3a95e54f9568c70d54f145ff4fb363 Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Sat, 30 Jan 2021 20:23:11 +1300
Subject: [PATCH] If the observer is riding the disguised entity, don't do
 weird player stuff

---
 .../utilities/packets/packethandlers/PacketHandlerSpawn.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java
index df2d7719..536a8d2c 100644
--- a/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java
+++ b/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java
@@ -206,7 +206,7 @@ public class PacketHandlerSpawn implements IPacketHandler {
             double dist = observer.getLocation().distanceSquared(disguisedEntity.getLocation());
 
             // If self disguise, or further than 50 blocks, or not in front of entity
-            normalPlayerDisguise = observer == disguisedEntity || dist > (50 * 50) ||
+            normalPlayerDisguise = observer == disguisedEntity || disguisedEntity.getPassengers().contains(observer) || dist > (50 * 50) ||
                     (observer.getLocation().add(observer.getLocation().getDirection().normalize()).distanceSquared(disguisedEntity.getLocation()) - dist) < 0.3;
             sendArmor = normalPlayerDisguise;