Upstream
/
Citizens2
mirror of https://github.com/CitizensDev/Citizens2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Tweak remove --owner

This commit is contained in:
fullwall 2023-08-01 23:18:45 +08:00
parent c0230e07e7
commit 6fd768992a
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2395,11 +2395,19 @@ public class NPCCommands {
@Flag("eid") UUID eid, @Flag("world") String world, @Arg(value = 1, completions = "all") String action)
throws CommandException {
if (owner != null) {
Player playerOwner = Bukkit.getPlayerExact(owner);
UUID uuid = null;
try {
uuid = UUID.fromString(owner);
} catch (IllegalArgumentException ex) {
try {
uuid = Bukkit.getOfflinePlayer(owner).getUniqueId();
} catch (Exception e) {
}
}
for (NPC rem : Lists.newArrayList(CitizensAPI.getNPCRegistry())) {
if (!rem.getOrAddTrait(Owner.class).isOwnedBy(sender))
continue;
if (playerOwner != null && rem.getOrAddTrait(Owner.class).isOwnedBy(playerOwner)) {
if (uuid != null && rem.getOrAddTrait(Owner.class).isOwnedBy(uuid)) {
history.add(sender, new RemoveNPCHistoryItem(rem));
rem.destroy(sender);
} else if (rem.getOrAddTrait(Owner.class).isOwnedBy(owner)) {