From 9a2dc52e87eb541f467b721054ab629159025ccd Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 14 Aug 2014 22:32:45 +0100 Subject: [PATCH 1/3] Using qop should now only op those who are not op. This will further reduce the amount of spam and doesn't spam everyone with "you are now op". --- .../TotalFreedomMod/Commands/Command_qop.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java index e6ab88b1..9823d270 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java @@ -34,16 +34,21 @@ public class Command_qop extends TFM_Command { if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)) { - matchedPlayerNames.add(player.getName()); - player.setOp(true); - player.sendMessage(TotalFreedomMod.YOU_ARE_OP); + if (!player.isOp()) + { + matchedPlayerNames.add(player.getName()); + player.setOp(true); + player.sendMessage(TotalFreedomMod.YOU_ARE_OP); + } } } if (!matchedPlayerNames.isEmpty()) { + if (!silent) { + TFM_Util.adminAction(sender.getName(), "Opping " + StringUtils.join(matchedPlayerNames, ", "), false); } } From c490a3d62ee82e14f7abd9680b3077635d78f6bf Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 14 Aug 2014 22:37:20 +0100 Subject: [PATCH 2/3] Now made qdeop require you to be op else it wont try to deop the player. --- .../TotalFreedomMod/Commands/Command_qdeop.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java index 4a24e8f4..9e7452b0 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qdeop.java @@ -34,9 +34,12 @@ public class Command_qdeop extends TFM_Command { if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)) { - matchedPlayerNames.add(player.getName()); - player.setOp(false); - player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); + if (player.isOp()) + { + matchedPlayerNames.add(player.getName()); + player.setOp(false); + player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); + } } } From 1bf1267b49da76d4e273e1810be273bcc1c9549d Mon Sep 17 00:00:00 2001 From: StevenLawson Date: Fri, 15 Aug 2014 16:29:40 -0400 Subject: [PATCH 3/3] Remove extra lines. --- src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java index 9823d270..44fa8154 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java +++ b/src/me/StevenLawson/TotalFreedomMod/Commands/Command_qop.java @@ -45,10 +45,8 @@ public class Command_qop extends TFM_Command if (!matchedPlayerNames.isEmpty()) { - if (!silent) { - TFM_Util.adminAction(sender.getName(), "Opping " + StringUtils.join(matchedPlayerNames, ", "), false); } }