Merge remote-tracking branch 'origin/main'

This commit is contained in:
business-goose 2022-03-23 23:16:03 +00:00
commit 5368ad722a

View file

@ -16,31 +16,30 @@ public class Command_myadmin extends FreedomCommand {
public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { public boolean run(CommandSender sender, Player sender_p, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) {
final UUID uuid = sender_p.getUniqueId(); // Get the sender's uuid as a variable. final UUID uuid = sender_p.getUniqueId(); // Get the sender's uuid as a variable.
if(args.length == 1) { if(args.length == 1) {
if ("clearloginmsg".equalsIgnoreCase(args[0])) { if ("clearloginmsg".equalsIgnoreCase(args[0])) {
playerMsg(ChatColor.GRAY + "Cleared your custom login message."); // Notify player that the login message has been set. playerMsg(ChatColor.GRAY + "Cleared your custom login message."); // Notify player that the login message has been set.
AdminList.getEntry(uuid).setCustomLoginMessage(""); // Set the custom login message to the value. AdminList.getEntry(uuid).setCustomLoginMessage(""); // Set the custom login message to the value.
AdminList.save(AdminList.getEntry(uuid)); // Save the modified value to the super admin configuration.
AdminList.updateIndexLists(); // Update and refresh configuration.
return true;
} else {
return false;
}
} else if (args.length >= 2) {
if ("setlogin".equalsIgnoreCase(args[0])) {
final String inputMessage = StringUtils.join(args, " ", 1, args.length); // Parse the input provided.
playerMsg(ChatColor.GRAY + "Set your custom login message."); // Notify player that the login message has been set.
AdminList.getEntry(uuid).setCustomLoginMessage(inputMessage); // Set the custom login message to the value.
AdminList.save(AdminList.getEntry(uuid)); // Save the modified value to the super admin configuration. AdminList.save(AdminList.getEntry(uuid)); // Save the modified value to the super admin configuration.
AdminList.updateIndexLists(); // Update and refresh configuration. AdminList.updateIndexLists(); // Update and refresh configuration.
return true; return true;
} else { } else {
return false; return false;
} }
} else if (args.length >= 2) {
if ("setlogin".equalsIgnoreCase(args[0])) {
final String inputMessage = StringUtils.join(args, " ", 1, args.length); // Parse the input provided.
playerMsg(ChatColor.GRAY + "Set your custom login message."); // Notify player that the login message has been set.
playerMsg(ChatColor.GRAY + "Your login message will show up as: \n" + ChatColor.AQUA + sender_p.getPlayer().getName() + " is " + inputMessage);
AdminList.getEntry(uuid).setCustomLoginMessage(inputMessage); // Set the custom login message to the value.
AdminList.save(AdminList.getEntry(uuid)); // Save the modified value to the super admin configuration.
AdminList.updateIndexLists(); // Update and refresh configuration.
return true;
} else {
return false;
}
} else { } else {
return false; return false;
} }