Merge branch 'patch-2'

This commit is contained in:
StevenLawson 2014-08-15 16:29:53 -04:00
commit 6ad1187eef
2 changed files with 12 additions and 6 deletions

View File

@ -34,9 +34,12 @@ public class Command_qdeop extends TFM_Command
{ {
if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)) if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
{ {
matchedPlayerNames.add(player.getName()); if (player.isOp())
player.setOp(false); {
player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); matchedPlayerNames.add(player.getName());
player.setOp(false);
player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
}
} }
} }

View File

@ -34,9 +34,12 @@ public class Command_qop extends TFM_Command
{ {
if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName)) if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
{ {
matchedPlayerNames.add(player.getName()); if (!player.isOp())
player.setOp(true); {
player.sendMessage(TotalFreedomMod.YOU_ARE_OP); matchedPlayerNames.add(player.getName());
player.setOp(true);
player.sendMessage(TotalFreedomMod.YOU_ARE_OP);
}
} }
} }