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

Merge from master

Browse Source
This commit is contained in:
unknown
2014-06-29 10:53:39 +02:00
parent e36ace1671 20d4e886fc
commit c4f1d0c06f
47 changed files with 327 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,6 @@ public class TFM_ServerInterface
public static void handlePlayerLogin(PlayerLoginEvent event)
{
final Server server = TotalFreedomMod.server;
final TFM_BanManager banManager = TFM_BanManager.getInstance();
final Player player = event.getPlayer();
@ -102,9 +101,9 @@ public class TFM_ServerInterface
if (!isAdmin) // If the player is not an admin
{
// UUID bans
if (banManager.isUuidBanned(uuid))
if (TFM_BanManager.isUuidBanned(uuid))
{
final TFM_Ban ban = banManager.getByUuid(uuid);
final TFM_Ban ban = TFM_BanManager.getByUuid(uuid);
String kickMessage = ChatColor.RED + "You are temporarily banned from this server."
+ "\nAppeal at " + ChatColor.GOLD + TFM_ConfigEntry.SERVER_BAN_URL.getString();
@ -123,9 +122,9 @@ public class TFM_ServerInterface
return;
}
if (banManager.isIpBanned(ip))
if (TFM_BanManager.isIpBanned(ip))
{
final TFM_Ban ban = banManager.getByIp(ip);
final TFM_Ban ban = TFM_BanManager.getByIp(ip);
String kickMessage = ChatColor.RED + "Your IP address is temporarily banned from this server."
+ "\nAppeal at " + ChatColor.GOLD + TFM_ConfigEntry.SERVER_BAN_URL.getString();