From 614b0b0361a7e235f30995fb9c208d7a0a473d7a Mon Sep 17 00:00:00 2001
From: mcmonkey4eva <agoodwin@freneticllc.com>
Date: Fri, 1 Sep 2017 22:41:21 -0700
Subject: [PATCH] improvement probably

---
 .../denizen/npc/traits/SittingTrait.java         | 16 +++++++++-------
 1 file changed, 9 insertions(+), 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
index bd45b6307b..75527fb276 100644
--- 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;
     }