AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2025-06-29 03:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fuck intellij

Browse Source
This commit is contained in:
Telesphoreo
2020-08-15 17:42:46 -05:00
parent e77d92407c
commit 53038ca3b2
185 changed files with 1242 additions and 1453 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/me/totalfreedom/totalfreedommod/player/FPlayer.java
View File

@ -306,12 +306,12 @@ public class FPlayer
{
if (getPlayer() != null)
{
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false);
FUtil.staffAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false);
setMuted(false);
}
else
{
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false);
FUtil.staffAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false);
plugin.mu.MUTED_PLAYERS.remove(getName());
}
}

40
src/main/java/me/totalfreedom/totalfreedommod/player/PlayerList.java
View File

@ -9,7 +9,7 @@ import java.util.List;
import java.util.Map;
import lombok.Getter;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FLog;
@ -110,8 +110,8 @@ public class PlayerList extends FreedomService
public boolean isTelnetMasterBuilder(PlayerData playerData)
{
Admin admin = plugin.al.getEntryByName(playerData.getName());
if (admin != null && admin.getRank().isAtLeast(Rank.TELNET_ADMIN) && playerData.isMasterBuilder())
StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName());
if (staffMember != null && staffMember.getRank().isAtLeast(Rank.MOD) && playerData.isMasterBuilder())
{
return true;
}
@ -156,14 +156,14 @@ public class PlayerList extends FreedomService
public Boolean isPlayerImpostor(Player player)
{
PlayerData playerData = getData(player);
return !plugin.al.isAdmin(player)
return !plugin.sl.isStaff(player)
&& (playerData.hasVerification())
&& !playerData.getIps().contains(FUtil.getIp(player));
}
public boolean isImposter(Player player)
{
return isPlayerImpostor(player) || plugin.al.isAdminImpostor(player);
return isPlayerImpostor(player) || plugin.sl.isAdminImpostor(player);
}
public void verify(Player player, String backupCode)
@ -176,35 +176,35 @@ public class PlayerList extends FreedomService
playerData.addIp(FUtil.getIp(player));
save(playerData);
if (plugin.al.isAdminImpostor(player))
if (plugin.sl.isAdminImpostor(player))
{
Admin admin = plugin.al.getEntryByName(player.getName());
admin.setLastLogin(new Date());
admin.addIp(FUtil.getIp(player));
plugin.al.updateTables();
plugin.al.save(admin);
StaffMember staffMember = plugin.sl.getEntryByName(player.getName());
staffMember.setLastLogin(new Date());
staffMember.addIp(FUtil.getIp(player));
plugin.sl.updateTables();
plugin.sl.save(staffMember);
}
plugin.rm.updateDisplay(player);
}
public void syncIps(Admin admin)
public void syncIps(StaffMember staffMember)
{
PlayerData playerData = getData(admin.getName());
PlayerData playerData = getData(staffMember.getName());
playerData.clearIps();
playerData.addIps(admin.getIps());
playerData.addIps(staffMember.getIps());
plugin.pl.save(playerData);
}
public void syncIps(PlayerData playerData)
{
Admin admin = plugin.al.getEntryByName(playerData.getName());
StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName());
if (admin != null && admin.isActive())
if (staffMember != null && staffMember.isActive())
{
admin.clearIPs();
admin.addIps(playerData.getIps());
plugin.al.updateTables();
plugin.al.save(admin);
staffMember.clearIPs();
staffMember.addIps(playerData.getIps());
plugin.sl.updateTables();
plugin.sl.save(staffMember);
}
}