TotalFreedomMC/TFGuilds
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TFGuilds.git synced 2024-12-22 16:05:00 +00:00
Code Issues Projects Releases Wiki Activity

I FORGOT TO APPLY THIS TO RENAMING

Browse source
This commit is contained in:
speedxx 2020-07-14 19:37:42 -04:00
parent bcb2fdb0e7
commit 9cb9f5949c
1 changed files with 37 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java
View file

@ -4,7 +4,6 @@ import me.totalfreedom.tfguilds.Common;
import me.totalfreedom.tfguilds.guild.Guild; import me.totalfreedom.tfguilds.guild.Guild;
import me.totalfreedom.tfguilds.util.GUtil; import me.totalfreedom.tfguilds.util.GUtil;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
@ -12,11 +11,19 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.Arrays;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
public class RenameSubcommand extends Common implements CommandExecutor public class RenameSubcommand extends Common implements CommandExecutor
{ {
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
{ {
List<String> BLACKLISTED_NAMES = Arrays.asList(
"admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "tca", "sta", "sa");
if (sender instanceof ConsoleCommandSender) if (sender instanceof ConsoleCommandSender)
{ {
sender.sendMessage(NO_PERMS); sender.sendMessage(NO_PERMS);
@ -24,6 +31,8 @@ public class RenameSubcommand extends Common implements CommandExecutor
} }
Player player = (Player) sender; Player player = (Player) sender;
Guild guild = Guild.getGuild(player); Guild guild = Guild.getGuild(player);
String newName = StringUtils.join(args, " ", 1, args.length);
String identifier = GUtil.flatten(newName);
if (guild == null) if (guild == null)
{ {
sender.sendMessage(ChatColor.RED + "You aren't in a guild!"); sender.sendMessage(ChatColor.RED + "You aren't in a guild!");
@ -34,7 +43,33 @@ public class RenameSubcommand extends Common implements CommandExecutor
sender.sendMessage(ChatColor.RED + "You can't change the name of your guild!"); sender.sendMessage(ChatColor.RED + "You can't change the name of your guild!");
return true; return true;
} }
String newName = StringUtils.join(args, " ", 1, args.length);
Pattern pattern = Pattern.compile("^[A-Za-z0-9? ,_-]+$");
Matcher matcher = pattern.matcher(newName);
if (!matcher.matches())
{
sender.sendMessage(ChatColor.RED + "Guild names must be alphanumeric.");
return true;
}
if (Guild.guildExists(identifier))
{
sender.sendMessage(ChatColor.RED + "A guild with a name similar to yours already exists!");
return true;
}
for (String blacklisted : BLACKLISTED_NAMES)
{
if (args[0].equalsIgnoreCase(blacklisted))
{
if (!plugin.bridge.isAdmin(player))
{
player.sendMessage(ChatColor.RED + "You may not use that name.");
return true;
}
}
}
guild.disband(); guild.disband();
guild.setIdentifier(GUtil.flatten(newName)); guild.setIdentifier(GUtil.flatten(newName));
guild.setName(newName); guild.setName(newName);