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

Merge branch 'frontdoor-and-banExpiry-only' of https://github.com/AtlasMediaGroup/TotalFreedomMod into frontdoor-and-banExpiry-only

Browse Source
This commit is contained in:
Paldiu
2021-03-06 12:12:59 -06:00
parent 5c097c83cb 9161016f73
commit 0dd5a26efa
10 changed files with 12 additions and 207 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: ", "");

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

@ -240,7 +240,8 @@ 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
return !verifiedNoAdmin.contains(player.getName()) || verifiedNoAdminIps.containsKey(player.getName()) && !verifiedNoAdminIps.get(player.getName()).contains(FUtil.getIp(player));
}
public boolean isIdentityMatched(Player player)

2
src/main/java/me/totalfreedom/totalfreedommod/util/TimeUnit.java
View File

@ -7,7 +7,7 @@ public enum TimeUnit
HOUR(MINUTE.get() * 60L),
DAY(HOUR.get() * 24L),
WEEK(DAY.get() * 7L),
MONTH(WEEK.get() * 4L),
MONTH(DAY.get() * 30L),
YEAR(MONTH.get() * 12L);
private final long time;