AtlasMediaGroup/TotalFreedomMod
1
0
Fork 0
mirror of https://github.com/AtlasMediaGroup/TotalFreedomMod.git synced 2024-11-30 10:05:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Forgot to actually make sure this compiles lol

Browse Source
This commit is contained in:
Seth 2020-08-14 23:48:31 -07:00
parent f5b5fcd5ef
commit 3f4d34d172
No known key found for this signature in database
GPG Key ID: A7BAB4E14F089CF3
5 changed files with 11 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/me/totalfreedom/totalfreedommod/ChatManager.java
View File

@ -142,47 +142,15 @@ public class ChatManager extends FreedomService
} }
} }
public ChatColor getColor(StaffMember staffMember, Displayable display) public ChatColor getColor(Displayable display)
{ {
ChatColor color = display.getColor(); ChatColor color = display.getColor();
if (staffMember.getOldTags())
{
if (color.equals(ChatColor.AQUA))
{
color = ChatColor.GOLD;
}
else if (color.equals(ChatColor.GOLD))
{
color = ChatColor.LIGHT_PURPLE;
}
else if (color.equals(ChatColor.DARK_RED))
{
color = ChatColor.BLUE;
}
}
return color; return color;
} }
public String getColoredTag(StaffMember staffMember, Displayable display) public String getColoredTag(Displayable display)
{ {
ChatColor color = display.getColor(); ChatColor color = display.getColor();
if (staffMember.getOldTags())
{
if (color.equals(ChatColor.AQUA))
{
color = ChatColor.GOLD;
}
else if (color.equals(ChatColor.GOLD))
{
color = ChatColor.LIGHT_PURPLE;
}
else if (color.equals(ChatColor.DARK_RED))
{
color = ChatColor.BLUE;
}
}
return color + display.getAbbr(); return color + display.getAbbr();
} }
@ -199,13 +167,13 @@ public class ChatManager extends FreedomService
if (!Strings.isNullOrEmpty(staffMember.getAcFormat())) if (!Strings.isNullOrEmpty(staffMember.getAcFormat()))
{ {
String format = staffMember.getAcFormat(); String format = staffMember.getAcFormat();
ChatColor color = getColor(staffMember, display); ChatColor color = getColor(display);
String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message); String msg = format.replace("%name%", sender.getName()).replace("%rank%", display.getAbbr()).replace("%rankcolor%", color.toString()).replace("%msg%", message);
player.sendMessage(FUtil.colorize(msg)); player.sendMessage(FUtil.colorize(msg));
} }
else else
{ {
player.sendMessage("[" + ChatColor.AQUA + "STAFF" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(staffMember, display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message)); player.sendMessage("[" + ChatColor.AQUA + "STAFF" + ChatColor.WHITE + "] " + ChatColor.DARK_RED + sender.getName() + ChatColor.DARK_GRAY + " [" + getColoredTag(display) + ChatColor.DARK_GRAY + "]" + ChatColor.WHITE + ": " + ChatColor.GOLD + FUtil.colorize(message));
} }
} }
} }

10
src/main/java/me/totalfreedom/totalfreedommod/LoginProcess.java
View File

@ -149,7 +149,7 @@ public class LoginProcess extends FreedomService
return; return;
} }
// Player is not an admin // Player is not a staff member
// Server full check // Server full check
if (server.getOnlinePlayers().size() >= server.getMaxPlayers()) if (server.getOnlinePlayers().size() >= server.getMaxPlayers())
{ {
@ -157,8 +157,8 @@ public class LoginProcess extends FreedomService
return; return;
} }
// Admin-only mode // Staff-only mode
if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
{ {
event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to admins only."); event.disallow(PlayerLoginEvent.Result.KICK_OTHER, "Server is temporarily open to admins only.");
return; return;
@ -257,9 +257,9 @@ public class LoginProcess extends FreedomService
@Override @Override
public void run() public void run()
{ {
if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
{ {
player.sendMessage(ChatColor.RED + "Server is currently closed to non-admins."); player.sendMessage(ChatColor.RED + "Server is currently closed to non-staff.");
} }
if (lockdownEnabled) if (lockdownEnabled)

2
src/main/java/me/totalfreedom/totalfreedommod/ServerPing.java
View File

@ -30,7 +30,7 @@ public class ServerPing extends FreedomService
return; return;
} }
if (ConfigEntry.ADMIN_ONLY_MODE.getBoolean()) if (ConfigEntry.STAFF_ONLY_MODE.getBoolean())
{ {
event.setMotd(FUtil.colorize(ConfigEntry.SERVER_STAFFMODE_MOTD.getString())); event.setMotd(FUtil.colorize(ConfigEntry.SERVER_STAFFMODE_MOTD.getString()));
return; return;

6
src/main/java/me/totalfreedom/totalfreedommod/command/Command_setspawnworld.java
View File

@ -1,6 +1,5 @@
package me.totalfreedom.totalfreedommod.command; package me.totalfreedom.totalfreedommod.command;
import me.totalfreedom.totalfreedommod.config.ConfigEntry;
import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil; import me.totalfreedom.totalfreedommod.util.FUtil;
import org.bukkit.Location; import org.bukkit.Location;
@ -21,11 +20,6 @@ public class Command_setspawnworld extends FreedomCommand
msg("Spawn location for this world set to: " + FUtil.formatLocation(playerSender.getWorld().getSpawnLocation())); msg("Spawn location for this world set to: " + FUtil.formatLocation(playerSender.getWorld().getSpawnLocation()));
if (ConfigEntry.PROTECTAREA_ENABLED.getBoolean() && ConfigEntry.PROTECTAREA_SPAWNPOINTS.getBoolean())
{
plugin.pa.addProtectedArea("spawn_" + playerSender.getWorld().getName(), pos, ConfigEntry.PROTECTAREA_RADIUS.getDouble());
}
return true; return true;
} }
} }

2
src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java
View File

@ -53,7 +53,7 @@ public class Module_players extends HTTPDModule
switch (staffMember.getRank()) switch (staffMember.getRank())
{ {
case SUPER_ADMIN: case TRIAL_MOD:
superadmins.add(username); superadmins.add(username);
break; break;
case MOD: case MOD: