mirror of
https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git
synced 2024-08-21 20:11:46 +00:00
Formatting
This commit is contained in:
parent
3da03393e6
commit
5c61ff27b0
|
@ -20,12 +20,12 @@ public class Command_cage extends TFM_Command
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (TFM_Util.isStopCommand(args[0]) && sender instanceof Player)
|
if (TFM_Util.isStopCommand(args[0]) && sender instanceof Player)
|
||||||
{
|
{
|
||||||
TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
|
TFM_Util.adminAction(sender.getName(), "Uncaging " + sender.getName(), true);
|
||||||
TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
|
TFM_PlayerData playerdata = TFM_PlayerData.getPlayerData(sender_p);
|
||||||
|
|
||||||
playerdata.setCaged(false);
|
playerdata.setCaged(false);
|
||||||
playerdata.regenerateHistory();
|
playerdata.regenerateHistory();
|
||||||
playerdata.clearHistory();
|
playerdata.clearHistory();
|
||||||
|
@ -47,7 +47,7 @@ public class Command_cage extends TFM_Command
|
||||||
|
|
||||||
Material outerMaterial = Material.GLASS;
|
Material outerMaterial = Material.GLASS;
|
||||||
Material innerMaterial = Material.AIR;
|
Material innerMaterial = Material.AIR;
|
||||||
|
|
||||||
if (args.length >= 2)
|
if (args.length >= 2)
|
||||||
{
|
{
|
||||||
if (TFM_Util.isStopCommand(args[1]))
|
if (TFM_Util.isStopCommand(args[1]))
|
||||||
|
@ -96,7 +96,7 @@ public class Command_cage extends TFM_Command
|
||||||
player.setGameMode(GameMode.SURVIVAL);
|
player.setGameMode(GameMode.SURVIVAL);
|
||||||
|
|
||||||
if (outerMaterial != Material.SKULL)
|
if (outerMaterial != Material.SKULL)
|
||||||
{
|
{
|
||||||
TFM_Util.adminAction(sender.getName(), "Caging " + player.getName(), true);
|
TFM_Util.adminAction(sender.getName(), "Caging " + player.getName(), true);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
@ -123,7 +123,7 @@ public class TFM_RollbackManager
|
||||||
public enum EntryType
|
public enum EntryType
|
||||||
{
|
{
|
||||||
BLOCK_PLACE, BLOCK_BREAK;
|
BLOCK_PLACE, BLOCK_BREAK;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString()
|
public String toString()
|
||||||
{
|
{
|
||||||
|
@ -179,7 +179,7 @@ public class TFM_RollbackManager
|
||||||
{
|
{
|
||||||
return Material.getMaterial(fromBlockId);
|
return Material.getMaterial(fromBlockId);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Material getToMaterial()
|
public Material getToMaterial()
|
||||||
{
|
{
|
||||||
return Material.getMaterial(toBlockId);
|
return Material.getMaterial(toBlockId);
|
||||||
|
|
|
@ -51,13 +51,13 @@ public class TFM_ServerInterface
|
||||||
public static void banUsername(String name, String reason, String source, Date expireDate)
|
public static void banUsername(String name, String reason, String source, Date expireDate)
|
||||||
{
|
{
|
||||||
name = name.toLowerCase().trim();
|
name = name.toLowerCase().trim();
|
||||||
|
|
||||||
if (TFM_SuperadminList.getSuperadminNames().contains(name))
|
if (TFM_SuperadminList.getSuperadminNames().contains(name))
|
||||||
{
|
{
|
||||||
TFM_Log.info("Not banning username " + name + ": is superadmin");
|
TFM_Log.info("Not banning username " + name + ": is superadmin");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (String username : (List<String>) TFM_ConfigEntry.UNBANNABLE_USERNAMES.getList())
|
for (String username : (List<String>) TFM_ConfigEntry.UNBANNABLE_USERNAMES.getList())
|
||||||
{
|
{
|
||||||
if (username.toLowerCase().trim().equals(name))
|
if (username.toLowerCase().trim().equals(name))
|
||||||
|
@ -66,7 +66,7 @@ public class TFM_ServerInterface
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
BanEntry entry = new BanEntry(name);
|
BanEntry entry = new BanEntry(name);
|
||||||
if (expireDate != null)
|
if (expireDate != null)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue