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

Store UUIDs in a SQLite database. Resolves #373 and resolves #406

Browse Source
This commit is contained in:
JeromSar
2015-02-16 17:00:38 +01:00
parent 34ebb3586c
commit af52dec24a
24 changed files with 1012 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,11 +66,11 @@ public class TFM_ServerInterface
final Server server = TotalFreedomMod.server;
final Player player = event.getPlayer();
final String username = player.getName();
final UUID uuid = TFM_UuidManager.getUniqueId(username);
final String ip = event.getAddress().getHostAddress().trim();
final UUID uuid = TFM_UuidManager.newPlayer(player, ip);
// Perform username checks
if (username.length() < 3 || username.length() > 20)
if (username.length() < 3 || username.length() > TotalFreedomMod.MAX_USERNAME_LENGTH)
{
event.disallow(Result.KICK_OTHER, "Your username is an invalid length (must be between 3 and 20 characters long).");
return;
@ -83,24 +83,16 @@ public class TFM_ServerInterface
}
// Check if player is admin
// Not safe to use TFM_Util.isSuperAdmin for player logging in because player.getAddress() will return a null until after player login.
final boolean isAdmin;
if (server.getOnlineMode())
{
isAdmin = TFM_AdminList.getSuperUUIDs().contains(uuid);
}
else
{
final TFM_Admin admin = TFM_AdminList.getEntryByIp(ip);
isAdmin = admin != null && admin.isActivated();
}
// Not safe to use TFM_Util.isSuperAdmin(player) because player.getAddress() will return a null until after player login.
final boolean isAdmin = TFM_AdminList.isSuperAdminSafe(uuid, ip);
// Validation below this point
if (isAdmin) // Player is superadmin
{
// force-allow log in
// Force-allow log in
event.allow();
// Kick players with the same name
for (Player onlinePlayer : server.getOnlinePlayers())
{
if (onlinePlayer.getName().equalsIgnoreCase(username))
@ -132,6 +124,7 @@ public class TFM_ServerInterface
event.disallow(Result.KICK_OTHER, "The server is full and a player could not be kicked, sorry!");
return;
}
return;
}