equalsIgnoreCase in /npc owner

CitizensDev · Oct 20, 2021 · 21e924f · 21e924f
1 parent 19c07ff
commit 21e924f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java b/main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
@@ -1430,12 +1430,14 @@ public void owner(CommandContext args, CommandSender sender, NPC npc) throws Com
             Messaging.sendTr(sender, Messages.NPC_OWNER, npc.getName(), ownerTrait.getOwnerId());
             return;
         }
-        OfflinePlayer p = Bukkit.getOfflinePlayer(args.getString(1));
+        OfflinePlayer p;
         UUID uuid;
-        if (p != null) {
+        if (args.getString(1).equalsIgnoreCase("SERVER")) {
+            uuid = null;
+        } else if ((p = Bukkit.getOfflinePlayer(args.getString(1))) != null) {
             uuid = p.getUniqueId();
         } else {
-            uuid = args.getString(1).equals("SERVER") ? null : UUID.fromString(args.getString(1));
+            uuid = UUID.fromString(args.getString(1));
         }
         if (ownerTrait.isOwnedBy(uuid))
             throw new CommandException(Messages.ALREADY_OWNER, uuid, npc.getName());