Minecraft's getVehicle method can return the same entity if no vehicl…

…e is present - convert this case to null
CitizensDev · Apr 5, 2016 · 7d310ce · 7d310ce
1 parent fe0e8ed
commit 7d310ce
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/main/java/net/citizensnpcs/util/NMS.java b/src/main/java/net/citizensnpcs/util/NMS.java
@@ -486,7 +486,8 @@ public static float getStepHeight(org.bukkit.entity.Entity entity) {
     }
 
     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) {