Check for online players in /npc remove --owner

CitizensDev · Jul 8, 2022 · 665e19d · 665e19d
1 parent 98c2d34
commit 665e19d
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1838,8 +1838,12 @@ public void rabbitType(CommandContext args, CommandSender sender, NPC npc) throw
     public void remove(final CommandContext args, final CommandSender sender, NPC npc) throws CommandException {
         if (args.hasValueFlag("owner")) {
             String owner = args.getFlag("owner");
+            Player playerOwner = Bukkit.getPlayerExact(owner);
             for (NPC rem : Lists.newArrayList(CitizensAPI.getNPCRegistry())) {
-                if (rem.getOrAddTrait(Owner.class).isOwnedBy(owner)) {
+                if (playerOwner != null && rem.getOrAddTrait(Owner.class).isOwnedBy(playerOwner)) {
+                    history.add(sender, new RemoveNPCHistoryItem(rem));
+                    rem.destroy(sender);
+                } else if (rem.getOrAddTrait(Owner.class).isOwnedBy(owner)) {
                     history.add(sender, new RemoveNPCHistoryItem(rem));
                     rem.destroy(sender);
                 }