AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-12 13:53:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Few fixes for JIRA issues....

Browse Source
This commit is contained in:
abhiram
2021-02-28 21:08:39 +05:30
parent 96d1c53ede
commit 6f66957b17
4 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/me/totalfreedom/totalfreedommod/admin/ActivityLogEntry.java
View File

@ -72,7 +72,15 @@ public class ActivityLogEntry implements IConfig
public void addLogout()
{
String lastLoginString = timestamps.get(timestamps.size() - 1); // there's a bug with subtracting the -1 here
// Fix of Array index out of bonds issue: FS-131
String lastLoginString;
if(timestamps.size() > 1)
{
lastLoginString = timestamps.get(timestamps.size() - 1);
}else
{
lastLoginString = timestamps.get(0);
}
Date currentTime = Date.from(Instant.now());
timestamps.add("Logout: " + FUtil.dateToString(currentTime));
lastLoginString = lastLoginString.replace("Login: ", "");

8
src/main/java/me/totalfreedom/totalfreedommod/admin/AdminList.java
View File

@ -240,7 +240,13 @@ public class AdminList extends FreedomService
public boolean isVerifiedAdmin(Player player)
{
return verifiedNoAdmin.contains(player.getName()) && verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player));
// Fix of issue: FS-33
if(verifiedNoAdmin.contains(player.getName()) || verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player)))
{
return false;
}
return true;
}
public boolean isIdentityMatched(Player player)