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

Merge pull request #268 from speedxx/development

Browse Source 
stuff seth missed
This commit is contained in:
Telesphoreo
2020-08-15 19:24:47 -05:00
committed by GitHub
parent ed5d18c0df b0daf2066a
commit 7b9920dbc4
35 changed files with 141 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,7 @@ public class FPlayer
private BukkitTask lockupScheduleTask = null;
private boolean lockedUp = false;
private String lastMessage = "";
private boolean inAdminchat = false;
private boolean inStaffchat = false;
private boolean allCommandsBlocked = false;
@Getter
@Setter
@ -348,14 +348,14 @@ public class FPlayer
return lastMessage;
}
public void setAdminChat(boolean inAdminchat)
public void setStaffChat(boolean inStaffchat)
{
this.inAdminchat = inAdminchat;
this.inStaffchat = inStaffchat;
}
public boolean inAdminChat()
public boolean inStaffChat()
{
return this.inAdminchat;
return this.inStaffchat;
}
public boolean allCommandsBlocked()

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

@ -163,7 +163,7 @@ public class PlayerList extends FreedomService
public boolean isImposter(Player player)
{
return isPlayerImpostor(player) || plugin.sl.isAdminImpostor(player);
return isPlayerImpostor(player) || plugin.sl.isStaffImpostor(player);
}
public void verify(Player player, String backupCode)
@ -173,10 +173,11 @@ public class PlayerList extends FreedomService
{
playerData.removeBackupCode(backupCode);
}
playerData.addIp(FUtil.getIp(player));
save(playerData);
if (plugin.sl.isAdminImpostor(player))
if (plugin.sl.isStaffImpostor(player))
{
StaffMember staffMember = plugin.sl.getEntryByName(player.getName());
staffMember.setLastLogin(new Date());
@ -195,6 +196,7 @@ public class PlayerList extends FreedomService
playerData.addIps(staffMember.getIps());
plugin.pl.save(playerData);
}
public void syncIps(PlayerData playerData)
{
StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName());
@ -246,7 +248,7 @@ public class PlayerList extends FreedomService
playerData = loadByIp(FUtil.getIp(player));
if (playerData != null)
{
plugin.sql.updatePlayerName(playerData.getName(),player.getName());
plugin.sql.updatePlayerName(playerData.getName(), player.getName());
playerData.setName(player.getName());
dataMap.put(player.getName(), playerData);
return playerData;
@ -312,5 +314,4 @@ public class PlayerList extends FreedomService
return player;
}
}
}