From ca0e2e2c62a182ddcf54d792474022a222f311f2 Mon Sep 17 00:00:00 2001
From: speedxx <43330808+speedxx@users.noreply.github.com>
Date: Thu, 16 Jul 2020 18:46:57 -0400
Subject: [PATCH] ffff
---
TFGuilds.iml | 2 +-
pom.xml | 2 +-
.../tfguilds/command/CreateSubcommand.java | 7 +------
.../tfguilds/command/HelpSubcommand.java | 2 +-
.../tfguilds/command/ListSubcommand.java | 3 ---
.../tfguilds/command/RenameSubcommand.java | 8 ++------
.../tfguilds/command/TagSubcommand.java | 17 +++++++++++++++++
.../me/totalfreedom/tfguilds/util/GUtil.java | 5 +++++
8 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/TFGuilds.iml b/TFGuilds.iml
index 6e3d2a4..c1e8347 100644
--- a/TFGuilds.iml
+++ b/TFGuilds.iml
@@ -27,7 +27,7 @@
-
+
diff --git a/pom.xml b/pom.xml
index a0d8ce1..798e08f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
me.totalfreedom
TFGuilds
- 0.2.3
+ 0.2.4
jar
TFGuilds
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java
index 629026a..c682767 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/CreateSubcommand.java
@@ -12,8 +12,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player;
-import java.util.Arrays;
-import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -22,9 +20,6 @@ public class CreateSubcommand extends Common implements CommandExecutor
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
{
- List BLACKLISTED_NAMES = Arrays.asList(
- "admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "sta", "sa", "super admin", "telnet admin", "senior admin");
-
if (sender instanceof ConsoleCommandSender)
{
sender.sendMessage(NO_PERMS);
@@ -65,7 +60,7 @@ public class CreateSubcommand extends Common implements CommandExecutor
return true;
}
- for (String blacklisted : BLACKLISTED_NAMES)
+ for (String blacklisted : GUtil.BLACKLISTED_NAMES_AND_TAGS)
{
if (name.equalsIgnoreCase(blacklisted))
{
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
index 881b785..27a2719 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/HelpSubcommand.java
@@ -22,7 +22,7 @@ public class HelpSubcommand extends Common implements CommandExecutor
sender.sendMessage(tl("%s% - %p%kick | player>"));
sender.sendMessage(tl("%s% - %p%leave"));
sender.sendMessage(tl("%s% - %p%tp "));
- sender.sendMessage(tl("%s% - %p%info [guild]"));
+ sender.sendMessage(tl("%s% - %p%info [guild | player]"));
sender.sendMessage(tl("%s% - %p%tag | clear>"));
sender.sendMessage(tl("%s% - %p%rename "));
sender.sendMessage(tl("%s% - %p%createrank "));
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/ListSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/ListSubcommand.java
index fdc8cfd..8ba715d 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/ListSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/ListSubcommand.java
@@ -15,9 +15,6 @@ public class ListSubcommand extends Common implements CommandExecutor
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
{
- if (args.length != 1)
- return false;
-
List guilds = Guild.getGuildList();
if (guilds.isEmpty())
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java
index 2d6f501..f7c0b1e 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/RenameSubcommand.java
@@ -3,7 +3,7 @@ package me.totalfreedom.tfguilds.command;
import me.totalfreedom.tfguilds.Common;
import me.totalfreedom.tfguilds.guild.Guild;
import me.totalfreedom.tfguilds.util.GUtil;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
@@ -11,8 +11,6 @@ import org.bukkit.command.CommandSender;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.Player;
-import java.util.Arrays;
-import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -21,8 +19,6 @@ public class RenameSubcommand extends Common implements CommandExecutor
@Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args)
{
- List BLACKLISTED_NAMES = Arrays.asList(
- "admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "tca", "sta", "sa");
if (args.length < 2)
return false;
if (sender instanceof ConsoleCommandSender)
@@ -60,7 +56,7 @@ public class RenameSubcommand extends Common implements CommandExecutor
return true;
}
- for (String blacklisted : BLACKLISTED_NAMES)
+ for (String blacklisted : GUtil.BLACKLISTED_NAMES_AND_TAGS)
{
if (args[0].equalsIgnoreCase(blacklisted))
{
diff --git a/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java b/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java
index 01315e3..010d663 100644
--- a/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java
+++ b/src/main/java/me/totalfreedom/tfguilds/command/TagSubcommand.java
@@ -21,8 +21,10 @@ public class TagSubcommand extends Common implements CommandExecutor
sender.sendMessage(NO_PERMS);
return true;
}
+
if (args.length < 2)
return false;
+
Player player = (Player) sender;
Guild guild = Guild.getGuild(player);
if (guild == null)
@@ -30,11 +32,13 @@ public class TagSubcommand extends Common implements CommandExecutor
sender.sendMessage(ChatColor.RED + "You aren't in a guild!");
return true;
}
+
if (!guild.getOwner().equals(player.getName()))
{
sender.sendMessage(ChatColor.RED + "You can't modify your guild's tag!");
return true;
}
+
if (args.length >= 3)
{
if (args[1].toLowerCase().equals("set"))
@@ -43,6 +47,18 @@ public class TagSubcommand extends Common implements CommandExecutor
tag = tag.replace("%tag%", guild.getName());
+ for (String blacklisted : GUtil.BLACKLISTED_NAMES_AND_TAGS)
+ {
+ if (tag.equalsIgnoreCase(blacklisted))
+ {
+ if (!plugin.bridge.isAdmin(player))
+ {
+ player.sendMessage(ChatColor.RED + "You may not use that name.");
+ return true;
+ }
+ }
+ }
+
guild.setTag(tag);
guild.save();
sender.sendMessage(tl("%p%Your guild tag has been changed to be \"" + GUtil.colorize(tag) + "%p%\"."));
@@ -50,6 +66,7 @@ public class TagSubcommand extends Common implements CommandExecutor
}
return false;
}
+
if (args[1].toLowerCase().equals("clear"))
{
guild.setTag(null);
diff --git a/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java b/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
index 3be875c..158682d 100644
--- a/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
+++ b/src/main/java/me/totalfreedom/tfguilds/util/GUtil.java
@@ -4,7 +4,9 @@ import org.apache.commons.lang.StringUtils;
import org.bukkit.ChatColor;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -40,4 +42,7 @@ public class GUtil
Date date = new Date(time);
return STANDARD.format(date);
}
+
+ public static List BLACKLISTED_NAMES_AND_TAGS = Arrays.asList(
+ "admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "sta", "sa", "super admin", "telnet admin", "senior admin");
}
\ No newline at end of file