diff --git a/TotalFreedomMod.iml b/TotalFreedomMod.iml
index fc53ee0d..02d38e68 100644
--- a/TotalFreedomMod.iml
+++ b/TotalFreedomMod.iml
@@ -59,6 +59,7 @@
+
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
index 4dad074a..b2b1c480 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
@@ -18,7 +18,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH, blockHostConsole = true)
-@CommandParameters(description = "Bans a player", usage = "/ [reason] [-nrb]", aliases = "ban")
+@CommandParameters(description = "Bans a player", usage = "/ [reason] [-rb]", aliases = "ban")
public class Command_gtfo extends FreedomCommand
{
@@ -78,12 +78,12 @@ public class Command_gtfo extends FreedomCommand
}
String reason = null;
- Boolean cancelRollback = false;
+ Boolean rollback = false;
if (args.length >= 2)
{
- if (args[args.length - 1].equals("-nrb"))
+ if (args[args.length - 1].equalsIgnoreCase("-rb"))
{
- cancelRollback = true;
+ rollback = true;
if (args.length >= 3)
{
reason = StringUtils.join(ArrayUtils.subarray(args, 1, args.length - 1), " ");
@@ -96,7 +96,7 @@ public class Command_gtfo extends FreedomCommand
}
// Checks if CoreProtect is loaded and installed, and skips the rollback and uses CoreProtect directly
- if (!cancelRollback)
+ if (rollback)
{
if (!plugin.cpb.isEnabled())
{
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
index 70eef744..92252506 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagnyan.java
@@ -30,13 +30,25 @@ public class Command_tagnyan extends FreedomCommand
}
String tagStr = tag.toString();
- for (String word : Command_tag.FORBIDDEN_WORDS)
+
+ if (!plugin.al.isAdmin(sender))
{
- if (tagStr.contains(word))
+ final String rawTag = ChatColor.stripColor(tagStr).toLowerCase();
+
+ if (rawTag.length() > 20)
{
- msg("That tag contains a forbidden word.");
+ msg("That tag is too long (Max is 20 characters).");
return true;
}
+
+ for (String word : Command_tag.FORBIDDEN_WORDS)
+ {
+ if (rawTag.contains(word))
+ {
+ msg("That tag contains a forbidden word.");
+ return true;
+ }
+ }
}
final FPlayer data = plugin.pl.getPlayer(playerSender);
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java
similarity index 65%
rename from src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java
rename to src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java
index 1a85fe0e..551106b4 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tagrainbow.java
@@ -10,7 +10,7 @@ import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
@CommandParameters(description = "Gives you a rainbow tag", usage = "/ ")
-public class Command_rainbowtag extends FreedomCommand
+public class Command_tagrainbow extends FreedomCommand
{
@Override
@@ -23,19 +23,24 @@ public class Command_rainbowtag extends FreedomCommand
final String tag = ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")));
- if (tag.length() > 20)
+ if (!plugin.al.isAdmin(sender))
{
- msg("That tag is too long (Max is 20 characters).");
- return true;
- }
+ final String rawTag = ChatColor.stripColor(tag).toLowerCase();
- for (String word : Command_tag.FORBIDDEN_WORDS)
- {
- if (tag.contains(word))
+ if (rawTag.length() > 20)
{
- msg("That tag contains a forbidden word.");
+ msg("That tag is too long (Max is 20 characters).");
return true;
}
+
+ for (String word : Command_tag.FORBIDDEN_WORDS)
+ {
+ if (rawTag.contains(word))
+ {
+ msg("That tag contains a forbidden word.");
+ return true;
+ }
+ }
}
plugin.pl.getPlayer(playerSender).setTag(FUtil.rainbowify(tag));
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java
index 9feb6af5..ab44b3a3 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unban.java
@@ -12,7 +12,7 @@ import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH)
-@CommandParameters(description = "Unbans a player", usage = "/ [-restore]", aliases = "pardon")
+@CommandParameters(description = "Unbans a player", usage = "/ [-r[estore]]", aliases = "pardon")
public class Command_unban extends FreedomCommand
{
@@ -40,7 +40,7 @@ public class Command_unban extends FreedomCommand
if (args.length >= 2)
{
- if (args[args.length - 1].equals("-restore"))
+ if (args[1].equalsIgnoreCase("-r") || args[1].equalsIgnoreCase("-restore"))
{
if (!plugin.cpb.isEnabled())
{