improvement probably

DenizenScript · Sep 2, 2017 · 614b0b0 · 614b0b0
1 parent ee400ac
commit 614b0b0
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/plugin/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java b/plugin/src/main/java/net/aufdemrand/denizen/npc/traits/SittingTrait.java
@@ -96,16 +96,18 @@ private void sitInternal() {
     }
 
     private void standInternal() {
-        Entity vehicle = npc.getEntity().getVehicle();
-        npc.despawn();
-        npc.spawn(npc.getStoredLocation().clone().add(0, 0.5, 0));
-        if (vehicle != null && vehicle.isValid()) {
-            vehicle.setPassenger(null);
-            vehicle.remove();
-        }
         if (npc.getEntity() instanceof Player) {
             PlayerAnimation.STOP_SITTING.play((Player) npc.getEntity());
         }
+        else {
+            Entity vehicle = npc.getEntity().getVehicle();
+            npc.despawn();
+            npc.spawn(npc.getStoredLocation().clone().add(0, 0.5, 0));
+            if (vehicle != null && vehicle.isValid()) {
+                vehicle.setPassenger(null);
+                vehicle.remove();
+            }
+        }
         //eh.getDataWatcher().watch(0, (byte) 0x00);
         sitting = false;
     }