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

stuff seth missed

Browse Source 
admin -> staff
This commit is contained in:
speedxx
2020-08-15 12:35:48 -04:00
parent 3f4d34d172
commit 78b73b3b63
36 changed files with 148 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/me/totalfreedom/totalfreedommod/rank/Rank.java
View File

@ -11,7 +11,7 @@ public enum Rank implements Displayable
OP("an", "Operator", Type.PLAYER, "OP", ChatColor.GREEN, null, false),
TRIAL_MOD("a", "Trial Moderator", Type.STAFF, "Trial Mod", ChatColor.AQUA, org.bukkit.ChatColor.AQUA, true),
MOD("a", "Moderator", Type.STAFF, "Mod", ChatColor.DARK_GREEN, org.bukkit.ChatColor.DARK_GREEN, true),
ADMIN("a", "Administrator", Type.STAFF, "Administrator", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true),
ADMIN("an", "Administrator", Type.STAFF, "Administrator", ChatColor.GOLD, org.bukkit.ChatColor.GOLD, true),
MOD_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false),
ADMIN_CONSOLE("the", "Console", Type.STAFF_CONSOLE, "Console", ChatColor.DARK_PURPLE, null, false);
@Getter
@ -32,7 +32,7 @@ public enum Rank implements Displayable
@Getter
private final boolean hasTeam;
private Rank(String determiner, String name, Type type, String abbr, ChatColor color, org.bukkit.ChatColor teamColor, Boolean hasTeam)
Rank(String determiner, String name, Type type, String abbr, ChatColor color, org.bukkit.ChatColor teamColor, Boolean hasTeam)
{
this.type = type;
this.name = name;
@ -94,7 +94,7 @@ public enum Rank implements Displayable
return getConsoleVariant().getLevel() >= rank.getConsoleVariant().getLevel();
}
public boolean isAdmin()
public boolean isStaff()
{
return getType() == Type.STAFF || getType() == Type.STAFF_CONSOLE;
}
@ -139,10 +139,9 @@ public enum Rank implements Displayable
STAFF,
STAFF_CONSOLE;
public boolean isAdmin()
public boolean isStaff()
{
return this != PLAYER;
}
}
}
}

31
src/main/java/me/totalfreedom/totalfreedommod/rank/RankManager.java
View File

@ -19,6 +19,7 @@ import org.bukkit.scoreboard.Team;
public class RankManager extends FreedomService
{
@Override
public void onStart()
{
@ -39,7 +40,7 @@ public class RankManager extends FreedomService
final Player player = (Player)sender;
// Display impostors
if (plugin.sl.isAdminImpostor(player))
if (plugin.sl.isStaffImpostor(player))
{
return Rank.IMPOSTOR;
}
@ -66,12 +67,12 @@ public class RankManager extends FreedomService
return Title.ASSISTANT_EXECUTIVE;
}
if (plugin.sl.isVerifiedAdmin(player))
if (plugin.sl.isVerifiedStaff(player))
{
return Title.VERIFIED_ADMIN;
return Title.VERIFIED_STAFF;
}
// Master builders show up if they are not admins
// Master builders show up if they are not staff
if (plugin.pl.getData(player).isMasterBuilder() && !plugin.sl.isStaff(player))
{
return Title.MASTER_BUILDER;
@ -142,7 +143,7 @@ public class RankManager extends FreedomService
public Rank getRank(Player player)
{
if (plugin.sl.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player))
if (plugin.sl.isStaffImpostor(player) || plugin.pl.isPlayerImpostor(player))
{
return Rank.IMPOSTOR;
}
@ -202,14 +203,14 @@ public class RankManager extends FreedomService
final FPlayer fPlayer = plugin.pl.getPlayer(player);
PlayerData target = plugin.pl.getData(player);
// Unban admins
boolean isAdmin = plugin.sl.isStaff(player);
if (isAdmin)
// Unban staff
boolean isStaff = plugin.sl.isStaff(player);
if (isStaff)
{
// Verify strict IP match
if (!plugin.sl.isIdentityMatched(player))
{
FUtil.bcastMsg("Warning: " + player.getName() + " is an admin, but is using an account not registered to one of their ip-list.", ChatColor.RED);
FUtil.bcastMsg("Warning: " + player.getName() + " is a staff member, but is using an account not registered to one of their ip-list.", ChatColor.RED);
fPlayer.setSuperadminIdVerified(false);
}
else
@ -219,19 +220,19 @@ public class RankManager extends FreedomService
}
}
if (plugin.sl.isVerifiedAdmin(player))
if (plugin.sl.isVerifiedStaff(player))
{
FUtil.bcastMsg("Warning: " + player.getName() + " is an admin, but does not have any admin permissions.", ChatColor.RED);
FUtil.bcastMsg("Warning: " + player.getName() + " is a staff member, but does not have any staff permissions.", ChatColor.RED);
}
// Handle impostors
boolean isImpostor = plugin.sl.isAdminImpostor(player) || plugin.pl.isPlayerImpostor(player);
boolean isImpostor = plugin.sl.isStaffImpostor(player) || plugin.pl.isPlayerImpostor(player);
if (isImpostor)
{
FUtil.bcastMsg(ChatColor.AQUA + player.getName() + " is " + Rank.IMPOSTOR.getColoredLoginMessage());
if (plugin.sl.isAdminImpostor(player))
if (plugin.sl.isStaffImpostor(player))
{
FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as an admin impostor and has been frozen!", ChatColor.RED);
FUtil.bcastMsg("Warning: " + player.getName() + " has been flagged as a staff impostor and has been frozen!", ChatColor.RED);
}
else if (plugin.pl.isPlayerImpostor(player))
{
@ -248,7 +249,7 @@ public class RankManager extends FreedomService
}
// Broadcast login message
if (isAdmin || FUtil.isDeveloper(player.getName()) || plugin.pl.getData(player).isMasterBuilder() || plugin.pl.getData(player).isDonator())
if (isStaff || FUtil.isDeveloper(player.getName()) || plugin.pl.getData(player).isMasterBuilder() || plugin.pl.getData(player).isDonator())
{
if (!plugin.sl.isVanished(player))
{

7
src/main/java/me/totalfreedom/totalfreedommod/rank/Title.java
View File

@ -8,7 +8,7 @@ public enum Title implements Displayable
DONATOR("a", "Premium Member", ChatColor.of("#ff5600"), org.bukkit.ChatColor.LIGHT_PURPLE, "Premium", true),
MASTER_BUILDER("a", "Master Builder", ChatColor.DARK_AQUA, org.bukkit.ChatColor.DARK_AQUA, "MB", true),
VERIFIED_ADMIN("a", "Verified Admin", ChatColor.LIGHT_PURPLE, org.bukkit.ChatColor.LIGHT_PURPLE, "VA", false),
VERIFIED_STAFF("a", "Verified Staff", ChatColor.LIGHT_PURPLE, org.bukkit.ChatColor.LIGHT_PURPLE, "VS", false),
ASSISTANT_EXECUTIVE("an", "Assistant Executive", ChatColor.RED, org.bukkit.ChatColor.RED, "Asst Exec", true),
EXECUTIVE("an", "Executive", ChatColor.RED, org.bukkit.ChatColor.RED, "Exec", true),
DEVELOPER("a", "Developer", ChatColor.DARK_PURPLE, org.bukkit.ChatColor.DARK_PURPLE, "Dev", true),
@ -30,7 +30,7 @@ public enum Title implements Displayable
@Getter
private final boolean hasTeam;
private Title(String determiner, String name, ChatColor color, org.bukkit.ChatColor teamColor, String tag, Boolean hasTeam)
Title(String determiner, String name, ChatColor color, org.bukkit.ChatColor teamColor, String tag, Boolean hasTeam)
{
this.determiner = determiner;
this.name = name;
@ -59,5 +59,4 @@ public enum Title implements Displayable
{
return determiner + " " + color + name;
}
}
}