From 8bd8efc6653bdbc1c299f54c5a586380d313ea84 Mon Sep 17 00:00:00 2001
From: ZeroEpoch1969 <13510767+ZeroEpoch1969@users.noreply.github.com>
Date: Mon, 30 Jul 2018 23:36:03 -0700
Subject: [PATCH] ok
---
.idea/codeStyles/Project.xml | 10 +++-
.../totalfreedommod/command/Command_tag.java | 51 ++++++++++++-------
2 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 38a1e788..3af1c59f 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,13 @@
+
+
+
@@ -15,4 +23,4 @@
-
+
\ No newline at end of file
diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
index 5c99ed00..02b7194c 100644
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
@@ -1,33 +1,41 @@
package me.totalfreedom.totalfreedommod.command;
-import java.util.Arrays;
-import java.util.List;
-
import me.totalfreedom.totalfreedommod.admin.Admin;
import me.totalfreedom.totalfreedommod.masterbuilder.MasterBuilder;
import me.totalfreedom.totalfreedommod.player.FPlayer;
import me.totalfreedom.totalfreedommod.playerverification.VPlayer;
import me.totalfreedom.totalfreedommod.rank.Rank;
import me.totalfreedom.totalfreedommod.util.FUtil;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
+import java.util.Arrays;
+import java.util.List;
@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Sets yourself a prefix", usage = "/ | off | clear | clearall>")
+@CommandParameters(description = "Sets yourself a prefix", usage = "/ [-s[ave]] | off | clear | clearall>")
public class Command_tag extends FreedomCommand
{
public static final List FORBIDDEN_WORDS = Arrays.asList(
- "admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "tca", "sta", "sa");
+ "admin", "owner", "moderator", "developer", "console", "dev", "staff", "mod", "sra", "tca", "sta", "sa");
@Override
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
{
+ boolean save = false;
+ if (args[0].equals("-s") || args[0].equals("-save"))
+ {
+ save = true;
+ args = ArrayUtils.remove(args, 0);
+ }
+
if (args.length == 1)
{
+
if ("list".equalsIgnoreCase(args[0]))
{
msg("Tags for all online players:");
@@ -77,8 +85,11 @@ public class Command_tag extends FreedomCommand
else
{
plugin.pl.getPlayer(playerSender).setTag(null);
- save(playerSender, null);
- msg("Your tag has been removed.");
+ if (save)
+ {
+ save(playerSender, null);
+ }
+ msg("Your tag has been removed." + (save ? " (Saved)" : ""));
}
return true;
@@ -107,8 +118,11 @@ public class Command_tag extends FreedomCommand
}
plugin.pl.getPlayer(player).setTag(null);
- save(player, null);
- msg("Removed " + player.getName() + "'s tag.");
+ if (save)
+ {
+ save(player, null);
+ }
+ msg("Removed " + player.getName() + "'s tag." + (save ? " (Saved)" : ""));
return true;
}
@@ -117,13 +131,13 @@ public class Command_tag extends FreedomCommand
final String inputTag = StringUtils.join(args, " ", 1, args.length);
final String strippedTag = StringUtils.replaceEachRepeatedly(StringUtils.strip(inputTag),
new String[]
- {
- "" + ChatColor.COLOR_CHAR, "&k"
- },
+ {
+ "" + ChatColor.COLOR_CHAR, "&k"
+ },
new String[]
- {
- "", ""
- });
+ {
+ "", ""
+ });
final String outputTag = FUtil.colorize(strippedTag);
if (!plugin.al.isAdmin(sender))
@@ -147,8 +161,11 @@ public class Command_tag extends FreedomCommand
}
plugin.pl.getPlayer(playerSender).setTag(outputTag);
- save(playerSender, strippedTag);
- msg("Tag set to '" + outputTag + ChatColor.GRAY + "'.");
+ if (save)
+ {
+ save(playerSender, null);
+ }
+ msg("Tag set to '" + outputTag + ChatColor.GRAY + "'." + (save ? " (Saved)" : ""));
return true;
}