type check in sleep command

DenizenScript · Jul 20, 2021 · bcf48c8 · bcf48c8
1 parent 6163cc0
commit bcf48c8
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SleepingTrait.java b/plugin/src/main/java/com/denizenscript/denizen/npc/traits/SleepingTrait.java
@@ -22,12 +22,9 @@ public class SleepingTrait extends Trait {
 
     @Override
     public void run() {
-        if (npc == null || bedLocation == null) {
+        if (npc == null || bedLocation == null || !npc.isSpawned()) {
             return;
         }
-
-        //if (npc.getEntity().getPassenger() == null && sitting) eh.mount(eh);
-
         if (!Utilities.checkLocation((LivingEntity) npc.getEntity(), bedLocation, 1)) {
             wakeUp();
         }
@@ -46,14 +43,17 @@ public void internalSleepNow() {
                 return;
             }
         }
-        else { // Player
+        else if (npc.getEntity() instanceof Player) {
             if (bedLocation.getBlock().getBlockData() instanceof Bed) {
                 ((Player) npc.getEntity()).sleep(bedLocation.clone(), true);
             }
             else {
                 PlayerAnimation.SLEEP.play((Player) npc.getEntity());
             }
         }
+        else {
+            return;
+        }
         sleeping = true;
     }
 
@@ -79,11 +79,6 @@ public void toSleep(Location location) {
         if (sleeping) {
             return;
         }
-
-        /*
-         * Teleport NPC to the location before
-         * playing sleep animation.
-         */
         //TODO Adjust the .add()
         npc.getEntity().teleport(location.clone().add(0.5, 0, 0.5));
         bedLocation = location.clone();

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/command/NPCCommandHandler.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/command/NPCCommandHandler.java
@@ -417,9 +417,9 @@ else if (npc.hasTrait(SleepingTrait.class)) {
 
     @Command(
             aliases = {"npc"}, usage = "sleep (--location x,y,z,world) (--anchor anchor_name)",
-            desc = "Makes the NPC sleep.", modifiers = {"sleep"},
+            desc = "Makes the NPC sleep.", modifiers = {"sleep" },
             min = 1, max = 3, permission = "denizen.npc.sleep")
-    @Requirements(selected = true, ownership = true)
+    @Requirements(selected = true, ownership = true, types = { EntityType.VILLAGER, EntityType.PLAYER })
     public void sleeping(CommandContext args, CommandSender sender, NPC npc) throws CommandException {
         SleepingTrait trait = npc.getOrAddTrait(SleepingTrait.class);
         if (trait.isSleeping()) {