mirror of
https://github.com/TheDeus-Group/TFM-4.3-Reloaded.git
synced 2024-12-23 03:34:57 +00:00
Fix NPE
This commit is contained in:
parent
912ae7d0e3
commit
85296bd864
1 changed files with 48 additions and 31 deletions
|
@ -1,5 +1,6 @@
|
||||||
package me.StevenLawson.TotalFreedomMod.commands;
|
package me.StevenLawson.TotalFreedomMod.commands;
|
||||||
|
|
||||||
|
import java.util.UUID;
|
||||||
import me.StevenLawson.TotalFreedomMod.admin.AdminList;
|
import me.StevenLawson.TotalFreedomMod.admin.AdminList;
|
||||||
import org.apache.commons.lang3.StringUtils;
|
import org.apache.commons.lang3.StringUtils;
|
||||||
import org.bukkit.ChatColor;
|
import org.bukkit.ChatColor;
|
||||||
|
@ -7,40 +8,56 @@ import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
|
||||||
import java.util.UUID;
|
|
||||||
|
|
||||||
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
|
@CommandPermissions(level = AdminLevel.SUPER, source = SourceType.ONLY_IN_GAME)
|
||||||
public class Command_myadmin extends FreedomCommand {
|
public class Command_myadmin extends FreedomCommand {
|
||||||
@Override
|
|
||||||
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.
|
|
||||||
if(args.length == 1) {
|
|
||||||
if ("clearloginmsg".equalsIgnoreCase(args[0])) {
|
|
||||||
playerMsg(sender, 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.
|
@Override
|
||||||
AdminList.save(AdminList.getEntry(uuid)); // Save the modified value to the super admin configuration.
|
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.
|
||||||
|
|
||||||
AdminList.updateIndexLists(); // Update and refresh configuration.
|
if (args.length == 1) {
|
||||||
return true;
|
if ("clearloginmsg".equalsIgnoreCase(args[0])) {
|
||||||
} else {
|
playerMsg(sender, ChatColor.GRAY
|
||||||
return false;
|
+ "Cleared your custom login message."); // Notify player that the login message has been set.
|
||||||
}
|
|
||||||
} else if (args.length >= 2) {
|
|
||||||
if ("setlogin".equalsIgnoreCase(args[0])) {
|
|
||||||
final String inputMessage = StringUtils.join(args, " ", 1, args.length); // Parse the input provided.
|
|
||||||
playerMsg(sender, ChatColor.GRAY + "Set your custom login message."); // Notify player that the login message has been set.
|
|
||||||
playerMsg(sender, ChatColor.GRAY + "Your login message will show up as: \n" + ChatColor.AQUA + sender_p.getPlayer().getName() + " is " + ChatColor.translateAlternateColorCodes('&', 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.
|
AdminList.getEntry(uuid)
|
||||||
return true;
|
.setCustomLoginMessage(""); // Set the custom login message to the value.
|
||||||
} else {
|
AdminList.save(AdminList.getEntry(
|
||||||
return false;
|
uuid)); // Save the modified value to the super admin configuration.
|
||||||
}
|
|
||||||
} else {
|
AdminList.updateIndexLists(); // Update and refresh configuration.
|
||||||
return false;
|
return true;
|
||||||
}
|
} else {
|
||||||
}
|
return false;
|
||||||
|
}
|
||||||
|
} else if (args.length >= 2) {
|
||||||
|
if ("setlogin".equalsIgnoreCase(args[0])) {
|
||||||
|
if (AdminList.getEntry(uuid)
|
||||||
|
== null) { // This means they're not actually in the super config. It will throw an exception if we don't return here.
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
final String inputMessage = StringUtils.join(args, " ", 1,
|
||||||
|
args.length); // Parse the input provided.
|
||||||
|
playerMsg(sender, ChatColor.GRAY
|
||||||
|
+ "Set your custom login message."); // Notify player that the login message has been set.
|
||||||
|
playerMsg(sender,
|
||||||
|
ChatColor.GRAY + "Your login message will show up as: \n" + ChatColor.AQUA
|
||||||
|
+ sender_p.getPlayer().getName() + " is "
|
||||||
|
+ ChatColor.translateAlternateColorCodes('&', 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 {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
Loading…
Reference in a new issue