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

@ -33,12 +33,15 @@ public class Command_qdeop extends TFM_Command
for (final Player player : server.getOnlinePlayers()) for (final 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))
{
if (player.isOp())
{ {
matchedPlayerNames.add(player.getName()); matchedPlayerNames.add(player.getName());
player.setOp(false); player.setOp(false);
player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP); player.sendMessage(TotalFreedomMod.YOU_ARE_NOT_OP);
} }
} }
}
if (!matchedPlayerNames.isEmpty()) if (!matchedPlayerNames.isEmpty())
{ {

View File

@ -33,12 +33,15 @@ public class Command_qop extends TFM_Command
for (final Player player : server.getOnlinePlayers()) for (final 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))
{
if (!player.isOp())
{ {
matchedPlayerNames.add(player.getName()); matchedPlayerNames.add(player.getName());
player.setOp(true); player.setOp(true);
player.sendMessage(TotalFreedomMod.YOU_ARE_OP); player.sendMessage(TotalFreedomMod.YOU_ARE_OP);
} }
} }
}
if (!matchedPlayerNames.isEmpty()) if (!matchedPlayerNames.isEmpty())
{ {