From cfbdb42360a90d96b5ba999ca487cb1e1931e024 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Wed, 6 Apr 2016 01:23:55 +0800
Subject: [PATCH] Minecraft's getVehicle method can return the same entity if
 no vehicle is present - convert this case to null

---
 src/main/java/net/citizensnpcs/util/NMS.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
index f4fefa5cb..b78b772dd 100644
--- a/src/main/java/net/citizensnpcs/util/NMS.java
+++ b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -486,7 +486,8 @@ public class NMS {
     }
 
     public static Entity getVehicle(org.bukkit.entity.Entity entity) {
-        return getHandle(entity).getVehicle();
+        Entity e = getHandle(entity).getVehicle();
+        return e == getHandle(entity) ? null : e;
     }
 
     public static void initNetworkManager(NetworkManager network) {