AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-07-01 04:26:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added unbannable usernames (defined in config)

Browse Source 
Changed all raw Lists in config to StringLists
This commit is contained in:
JeromSar
2013-08-24 21:35:09 +02:00
parent 143b323854
commit d71b043102
9 changed files with 64 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/me/StevenLawson/TotalFreedomMod/TFM_ServerInterface.java
View File

@ -3,6 +3,7 @@ package me.StevenLawson.TotalFreedomMod;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
import net.minecraft.server.v1_6_R2.BanEntry;
@ -50,6 +51,22 @@ public class TFM_ServerInterface
public static void banUsername(String name, String reason, String source, Date expire_date)
{
name = name.toLowerCase().trim();
if (TFM_SuperadminList.getSuperadminNames().contains(name))
{
TFM_Log.info("Not banning username " + name + ": is superadmin");
return;
}
for (String username : TFM_ConfigEntry.UNBANNABLE_USERNAMES.getStringList())
{
if (username.toLowerCase().trim().equals(name))
{
TFM_Log.info("Not banning username " + name + ": is unbannable as defined in config.");
return;
}
}
BanEntry ban_entry = new BanEntry(name);
if (expire_date != null)
{
@ -110,7 +127,6 @@ public class TFM_ServerInterface
return ipBans.getEntries().containsKey(ip);
}
@SuppressWarnings("rawtypes")
public static int purgeWhitelist()
{
Set whitelisted = MinecraftServer.getServer().getPlayerList().getWhitelisted();
@ -181,7 +197,6 @@ public class TFM_ServerInterface
boolean is_ip_banned = false;
@SuppressWarnings("rawtypes")
Iterator ip_bans = banByIP.getEntries().keySet().iterator();
while (ip_bans.hasNext())
{