From 5fa3f9f26a36d6266a7560b3d74b4e1923c0a041 Mon Sep 17 00:00:00 2001 From: Video Date: Thu, 29 Jul 2021 05:48:11 -0600 Subject: [PATCH] FS-337 I hate Codacy --- .../totalfreedommod/command/Command_deop.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java index 1cdddbe6..f0985d43 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_deop.java @@ -32,16 +32,14 @@ public class Command_deop extends FreedomCommand final List matchedPlayerNames = new ArrayList<>(); for (Player player : server.getOnlinePlayers()) { - if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName) + if ((player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName) || player.getName().contains(targetName) || player.getDisplayName().contains(targetName)) + && player.isOp() && !plugin.al.isVanished(player.getName())) { - if (player.isOp() && !plugin.al.isVanished(player.getName())) - { - matchedPlayerNames.add(player.getName()); - player.setOp(false); - msg(player, YOU_ARE_NOT_OP); - plugin.rm.updateDisplay(player); - } + matchedPlayerNames.add(player.getName()); + player.setOp(false); + msg(player, YOU_ARE_NOT_OP); + plugin.rm.updateDisplay(player); } }