Upstream/Citizens2
1
0
Fork 0
mirror of https://github.com/CitizensDev/Citizens2.git synced 2024-11-26 20:55:44 +01:00
Code Issues Projects Releases Wiki Activity

/npc owner [name] supported again

Browse Source
This commit is contained in:
fullwall 2021-10-13 17:56:22 +08:00
parent 4ecf09050a
commit 25f341ef63
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main/src/main/java/net/citizensnpcs/commands/NPCCommands.java
View File

@ -1430,7 +1430,13 @@ public class NPCCommands {
Messaging.sendTr(sender, Messages.NPC_OWNER, npc.getName(), ownerTrait.getOwnerId()); Messaging.sendTr(sender, Messages.NPC_OWNER, npc.getName(), ownerTrait.getOwnerId());
return; return;
} }
UUID uuid = args.getString(1).equals("SERVER") ? null : UUID.fromString(args.getString(1)); OfflinePlayer p = Bukkit.getOfflinePlayer(args.getString(1));
UUID uuid;
if (p != null) {
uuid = p.getUniqueId();
} else {
uuid = args.getString(1).equals("SERVER") ? null : UUID.fromString(args.getString(1));
}
if (ownerTrait.isOwnedBy(uuid)) if (ownerTrait.isOwnedBy(uuid))
throw new CommandException(Messages.ALREADY_OWNER, uuid, npc.getName()); throw new CommandException(Messages.ALREADY_OWNER, uuid, npc.getName());
ownerTrait.setOwner(uuid); ownerTrait.setOwner(uuid);