TotalFreedomMC/TF-LibsDisguises
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-LibsDisguises.git synced 2025-02-11 11:40:29 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up command code

Browse source
This commit is contained in:
libraryaddict 2019-03-05 17:47:00 +13:00
parent a43f46628a
commit 94f8371772
1 changed files with 34 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main/java/me/libraryaddict/disguise/commands/UndisguisePlayerCommand.java
View file

@ -53,40 +53,42 @@ public class UndisguisePlayerCommand implements CommandExecutor, TabCompleter {
@Override @Override
public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) { public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
if (sender.hasPermission("libsdisguises.undisguiseplayer")) { if (!sender.hasPermission("libsdisguises.undisguiseplayer")) {
if (args.length > 0) { sender.sendMessage(LibsMsg.NO_PERM.get());
Entity p = Bukkit.getPlayer(args[0]); return true;
}
if (p == null) { if (args.length == 0) {
if (p == null) { sender.sendMessage(LibsMsg.UNDISG_PLAYER_HELP.get());
return true;
}
Entity entityTarget = Bukkit.getPlayer(args[0]);
if (entityTarget == null) {
if (args[0].contains("-")) { if (args[0].contains("-")) {
try { try {
p = Bukkit.getEntity(UUID.fromString(args[0])); entityTarget = Bukkit.getEntity(UUID.fromString(args[0]));
} }
catch (Exception ignored) { catch (Exception ignored) {
} }
} }
} }
if (entityTarget == null) {
sender.sendMessage(LibsMsg.CANNOT_FIND_PLAYER.get(args[0]));
return true;
} }
if (p != null) { if (DisguiseAPI.isDisguised(entityTarget)) {
if (DisguiseAPI.isDisguised(p)) { DisguiseAPI.undisguiseToAll(entityTarget);
DisguiseAPI.undisguiseToAll(p);
sender.sendMessage(LibsMsg.UNDISG_PLAYER sender.sendMessage(LibsMsg.UNDISG_PLAYER
.get(p instanceof Player ? p.getName() : DisguiseType.getType(p).toReadable())); .get(entityTarget instanceof Player ? entityTarget.getName() : DisguiseType.getType(entityTarget).toReadable()));
} else { } else {
sender.sendMessage(LibsMsg.UNDISG_PLAYER_FAIL sender.sendMessage(LibsMsg.UNDISG_PLAYER_FAIL
.get(p instanceof Player ? p.getName() : DisguiseType.getType(p).toReadable())); .get(entityTarget instanceof Player ? entityTarget.getName() : DisguiseType.getType(entityTarget).toReadable()));
}
} else {
sender.sendMessage(LibsMsg.CANNOT_FIND_PLAYER.get(args[0]));
}
} else {
sender.sendMessage(LibsMsg.UNDISG_PLAYER_HELP.get());
}
} else {
sender.sendMessage(LibsMsg.NO_PERM.get());
} }
return true; return true;
} }