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

staff -> admins

Browse Source 
* rename everything containing staff back to admin (as requested by ryan i've renamed commands like slconfig to saconfig but left "slconfig" as an alias)
* format almost every file correctly
* a few other improvements
This commit is contained in:
speed
2020-12-03 19:28:53 -05:00
parent aae1f524ea
commit 293ea04c56
205 changed files with 1667 additions and 1696 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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 inStaffchat = false;
private boolean inAdminchat = false;
private boolean allCommandsBlocked = false;
@Getter
@Setter
@ -306,12 +306,12 @@ public class FPlayer
{
if (getPlayer() != null)
{
FUtil.staffAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false);
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getPlayer().getName(), false);
setMuted(false);
}
else
{
FUtil.staffAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false);
FUtil.adminAction(ConfigEntry.SERVER_NAME.getString(), "Unmuting " + getName(), false);
plugin.mu.MUTED_PLAYERS.remove(getName());
}
}
@ -348,14 +348,14 @@ public class FPlayer
return lastMessage;
}
public void setStaffChat(boolean inStaffchat)
public void setAdminChat(boolean inAdminchat)
{
this.inStaffchat = inStaffchat;
this.inAdminchat = inAdminchat;
}
public boolean inStaffChat()
public boolean inAdminChat()
{
return this.inStaffchat;
return this.inAdminchat;
}
public boolean allCommandsBlocked()
@ -439,4 +439,4 @@ public class FPlayer
shot.setVelocity(shot.getVelocity().multiply(2.0));
}
}
}
}

2
src/main/java/me/totalfreedom/totalfreedommod/player/PlayerData.java
View File

@ -267,4 +267,4 @@ public class PlayerData
{
return displayDiscord;
}
}
}

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

@ -11,7 +11,7 @@ import lombok.Getter;
import me.totalfreedom.totalfreedommod.FreedomService;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.staff.StaffMember;
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.util.FLog;
import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.OfflinePlayer;
@ -110,8 +110,8 @@ public class PlayerList extends FreedomService
public boolean isTelnetMasterBuilder(PlayerData playerData)
{
StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName());
if (staffMember != null && staffMember.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder())
Admin admin = plugin.al.getEntryByName(playerData.getName());
if (admin != null && admin.getRank().isAtLeast(Rank.ADMIN) && playerData.isMasterBuilder())
{
return true;
}
@ -157,14 +157,14 @@ public class PlayerList extends FreedomService
{
PlayerData playerData = getData(player);
return plugin.dc.enabled
&& !plugin.sl.isStaff(player)
&& !plugin.al.isAdmin(player)
&& (playerData.hasVerification())
&& !playerData.getIps().contains(FUtil.getIp(player));
}
public boolean IsImpostor(Player player)
{
return isPlayerImpostor(player) || plugin.sl.isStaffImpostor(player);
return isPlayerImpostor(player) || plugin.al.isAdminImpostor(player);
}
public void verify(Player player, String backupCode)
@ -178,36 +178,36 @@ public class PlayerList extends FreedomService
playerData.addIp(FUtil.getIp(player));
save(playerData);
if (plugin.sl.isStaffImpostor(player))
if (plugin.al.isAdminImpostor(player))
{
StaffMember staffMember = plugin.sl.getEntryByName(player.getName());
staffMember.setLastLogin(new Date());
staffMember.addIp(FUtil.getIp(player));
plugin.sl.updateTables();
plugin.sl.save(staffMember);
Admin admin = plugin.al.getEntryByName(player.getName());
admin.setLastLogin(new Date());
admin.addIp(FUtil.getIp(player));
plugin.al.updateTables();
plugin.al.save(admin);
}
plugin.rm.updateDisplay(player);
}
public void syncIps(StaffMember staffMember)
public void syncIps(Admin admin)
{
PlayerData playerData = getData(staffMember.getName());
PlayerData playerData = getData(admin.getName());
playerData.clearIps();
playerData.addIps(staffMember.getIps());
playerData.addIps(admin.getIps());
plugin.pl.save(playerData);
}
public void syncIps(PlayerData playerData)
{
StaffMember staffMember = plugin.sl.getEntryByName(playerData.getName());
Admin admin = plugin.al.getEntryByName(playerData.getName());
if (staffMember != null && staffMember.isActive())
if (admin != null && admin.isActive())
{
staffMember.clearIPs();
staffMember.addIps(playerData.getIps());
plugin.sl.updateTables();
plugin.sl.save(staffMember);
admin.clearIPs();
admin.addIps(playerData.getIps());
plugin.al.updateTables();
plugin.al.save(admin);
}
}