From 17078ba66aa6144bc8b59c6a73c6f995b9edd931 Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Fri, 16 Feb 2018 23:14:36 +0100
Subject: [PATCH] SPIGOT-3824: Return the direct vehicle of an entity, not the
 root vehicle

By: BlackHole <black-hole@live.com>
---
 .../main/java/org/bukkit/craftbukkit/entity/CraftEntity.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index 27ae8475a..961cf24c2 100644
--- a/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -507,7 +507,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
             return null;
         }
 
-        return getHandle().getVehicle().getBukkitEntity();
+        return getHandle().bJ().getBukkitEntity(); // PAIL: rename getVehicle() -> getRootVehicle(), bJ() -> getVehicle()
     }
 
     @Override