Formatting

This commit is contained in:
Steven Lawson 2013-08-26 18:44:18 -04:00
parent 3da03393e6
commit 5c61ff27b0
3 changed files with 9 additions and 9 deletions

View File

@ -20,12 +20,12 @@ public class Command_cage extends TFM_Command
{
return false;
}
if (TFM_Util.isStopCommand(args[0]) && sender instanceof Player)
{
TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
playerdata.setCaged(false);
playerdata.regenerateHistory();
playerdata.clearHistory();
@ -47,7 +47,7 @@ public class Command_cage extends TFM_Command
Material outerMaterial = Material.GLASS;
Material innerMaterial = Material.AIR;
if (args.length >= 2)
{
if (TFM_Util.isStopCommand(args[1]))
@ -96,7 +96,7 @@ public class Command_cage extends TFM_Command
player.setGameMode(GameMode.SURVIVAL);
if (outerMaterial != Material.SKULL)
{
{
TFM_Util.adminAction(sender.getName(), "Caging " + player.getName(), true);
}
else

View File

@ -123,7 +123,7 @@ public class TFM_RollbackManager
public enum EntryType
{
BLOCK_PLACE, BLOCK_BREAK;
@Override
public String toString()
{
@ -179,7 +179,7 @@ public class TFM_RollbackManager
{
return Material.getMaterial(fromBlockId);
}
public Material getToMaterial()
{
return Material.getMaterial(toBlockId);

View File

@ -51,13 +51,13 @@ public class TFM_ServerInterface
public static void banUsername(String name, String reason, String source, Date expireDate)
{
name = name.toLowerCase().trim();
if (TFM_SuperadminList.getSuperadminNames().contains(name))
{
TFM_Log.info("Not banning username " + name + ": is superadmin");
return;
}
for (String username : (List<String>) TFM_ConfigEntry.UNBANNABLE_USERNAMES.getList())
{
if (username.toLowerCase().trim().equals(name))
@ -66,7 +66,7 @@ public class TFM_ServerInterface
return;
}
}
BanEntry entry = new BanEntry(name);
if (expireDate != null)
{