AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-30 20:16:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved permban list to a seperate class

Browse Source 
Refractoring
Code cleanup
This commit is contained in:
unknown
2014-04-21 23:09:10 +02:00
parent a0affddeed
commit 08e4a4a171
7 changed files with 136 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
package me.StevenLawson.TotalFreedomMod;
import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
import java.text.SimpleDateFormat;
import java.util.Arrays;
import java.util.List;
import java.util.UUID;
import java.util.regex.Pattern;
import me.StevenLawson.TotalFreedomMod.Config.TFM_ConfigEntry;
import net.minecraft.server.v1_7_R3.MinecraftServer;
import net.minecraft.server.v1_7_R3.PropertyManager;
import org.bukkit.ChatColor;
@ -93,7 +93,8 @@ public class TFM_ServerInterface
}
else
{
isAdmin = TFM_AdminList.getEntryByIp(ip) != null;
final TFM_Admin admin = TFM_AdminList.getEntryByIp(ip);
isAdmin = admin != null && admin.isActivated();
}
// Validation below this point
@ -141,7 +142,7 @@ public class TFM_ServerInterface
}
// Permbanned Ips
for (String testIp : TotalFreedomMod.permbannedIps)
for (String testIp : TFM_PermbanList.getPermbannedIps())
{
if (TFM_Util.fuzzyIpMatch(testIp, ip, 4))
{
@ -152,7 +153,7 @@ public class TFM_ServerInterface
}
// Permbanned names
for (String testPlayer : TotalFreedomMod.permbannedPlayers)
for (String testPlayer : TFM_PermbanList.getPermbannedPlayers())
{
if (testPlayer.equalsIgnoreCase(username))
{