reduce code dup and misplacement issues with SittingTrait

DenizenScript · Jan 4, 2019 · 436b4eb · 436b4eb
1 parent d47ca88
commit 436b4eb
Showing 1 changed file with 2 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
@@ -78,14 +78,13 @@ public void onDespawn() {
      * Makes the NPC sit
      */
     public void sit() {
-        if (!npc.isSpawned() || npc.getEntity().getType() != EntityType.PLAYER) {
+        if (!npc.isSpawned()) {
             return;
         }
 
         DenizenAPI.getDenizenNPC(npc).action("sit", null);
 
-        chairLocation = npc.getEntity().getLocation().clone();
-        sitInternal();
+        sit(npc.getEntity().getLocation());
     }
 
     private void sitInternal() {
@@ -120,10 +119,6 @@ private void standInternal() {
     public void sitInternal(Location location) {
         DenizenAPI.getDenizenNPC(npc).action("sit", null);
 
-        if (npc.getEntity().getType() != EntityType.PLAYER) {
-            return;
-        }
-
         /*
          * Teleport NPC to the location before
          * sending the sit packet to the clients.