From be8203a832b298a7e57120f00bfc8341ca501000 Mon Sep 17 00:00:00 2001 From: ChargedCreeper Date: Sun, 13 Nov 2016 16:12:56 +0100 Subject: [PATCH 01/14] Added /unloadchunks. Resolves #1779 (#674) --- .../command/Command_unloadchunks.java | 43 +++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java new file mode 100644 index 000000000..4826f16a7 --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_unloadchunks.java @@ -0,0 +1,43 @@ +package me.totalfreedom.totalfreedommod.command; + +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FLog; +import me.totalfreedom.totalfreedommod.util.FUtil; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.Chunk; +import org.bukkit.World; +import org.bukkit.entity.Player; + +@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) +@CommandParameters(description = "Unloads chunks not currently in use", usage = "/", aliases = "rc") +public class Command_unloadchunks extends FreedomCommand { + + @Override + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { + FUtil.adminAction(sender.getName(), "Unloading unused chunks", false); + + int numChunks = 0; + + for (World world : server.getWorlds()) { + numChunks += unloadUnusedChunks(world); + } + + FUtil.playerMsg(sender, numChunks + " chunks unloaded."); + return true; + } + + private int unloadUnusedChunks(World world) { + int numChunks = 0; + + for (Chunk loadedChunk : world.getLoadedChunks()) { + if (!world.isChunkInUse(loadedChunk.getX(), loadedChunk.getZ())) { + if (world.unloadChunk(loadedChunk)) { + numChunks++; + } + } + } + + return numChunks; + } +} From 475b299e37988161b2c0a4fe650d1a6a2fa7685d Mon Sep 17 00:00:00 2001 From: PacksGamingHD Date: Sun, 13 Nov 2016 16:30:22 +0100 Subject: [PATCH 02/14] Fixed a typo in announcements (#911) --- src/main/resources/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index a30a3ad78..4de2c205b 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -247,7 +247,7 @@ announcer: - 'MarkByron is the owner of TotalFreedom.' - 'Server lagging? Check the lag via "/tps"' - 'You are allowed to record and stream videos on TotalFreedom.' - - 'Player vs player while in creative or god mode it forbidden!' + - 'Player vs player while in creative or god mode is forbidden!' - 'Spawn killing is forbidden!' - 'Invisible potions are allowed!' - 'Serial griefing and trolling will result in a permanent ban!' From 0eb0c7a02f040f9347369518f94bcc1173cb719d Mon Sep 17 00:00:00 2001 From: LegendIsAwesomes Date: Sun, 13 Nov 2016 16:46:06 +0100 Subject: [PATCH 03/14] Remove /invis smite, add /invis clear. Resolves #959 (#1011) --- .../command/Command_invis.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java index 8fb8bb4b6..f0267dca4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invis.java @@ -11,20 +11,20 @@ import org.bukkit.potion.PotionEffectType; @CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) -@CommandParameters(description = "Shows (optionally smites) invisisible players", usage = "/ (smite)") +@CommandParameters(description = "Shows (and optionally clears) invisisible players", usage = "/ [clear]") public class Command_invis extends FreedomCommand { @Override public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) { - boolean smite = false; + boolean clear = false; if (args.length >= 1) { - if (args[0].equalsIgnoreCase("smite")) + if (args[0].equalsIgnoreCase("clear")) { - FUtil.adminAction(sender.getName(), "Smiting all invisible players", true); - smite = true; + FUtil.adminAction(sender.getName(), "Clearing invisibility for all players", false); + clear = true; } else { @@ -33,17 +33,17 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin } List players = new ArrayList<>(); - int smites = 0; + int clears = 0; for (Player player : server.getOnlinePlayers()) { if (player.hasPotionEffect(PotionEffectType.INVISIBILITY)) { players.add(player.getName()); - if (smite && !plugin.al.isAdmin(player)) + if (clear && !plugin.al.isAdmin(player)) { - player.setHealth(0.0); - smites++; + player.removePotionEffect(PotionEffectType.INVISIBILITY); + clears++; } } } @@ -54,9 +54,9 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin return true; } - if (smite) + if (clear) { - msg("Smitten " + smites + " players"); + msg("Cleared invisibility effect from " + clears + " players"); } else { From 28142a688398352c4c966faf32549134bae80cee Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Thu, 17 Nov 2016 22:50:08 +0100 Subject: [PATCH 04/14] Update to Spigot 1.11-R1 --- pom.xml | 6 +++--- .../me/totalfreedom/totalfreedommod/ServerInterface.java | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index b35d71b55..721ac5fbe 100644 --- a/pom.xml +++ b/pom.xml @@ -59,10 +59,10 @@ org.spigotmc - spigot - 1.10 + spigot-server + 1.11 system - ${project.basedir}/lib/Spigot-1.10.jar + ${project.basedir}/lib/Spigot-1.11.jar diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index 9979d2a93..e0e964cd4 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -4,11 +4,11 @@ import java.util.List; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; -import net.minecraft.server.v1_10_R1.EntityPlayer; -import net.minecraft.server.v1_10_R1.MinecraftServer; -import net.minecraft.server.v1_10_R1.PropertyManager; +import net.minecraft.server.v1_11_R1.EntityPlayer; +import net.minecraft.server.v1_11_R1.MinecraftServer; +import net.minecraft.server.v1_11_R1.PropertyManager; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_10_R1.CraftServer; +import org.bukkit.craftbukkit.v1_11_R1.CraftServer; public class ServerInterface extends FreedomService { From 6e6842dbd24bf088a5a9d43204e95eafb5a2f03f Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Thu, 17 Nov 2016 22:56:50 +0100 Subject: [PATCH 05/14] Update compile version to v1_11_R1 --- .../java/me/totalfreedom/totalfreedommod/ServerInterface.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index e0e964cd4..83ca040b0 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -13,7 +13,7 @@ public class ServerInterface extends FreedomService { - public static final String COMPILE_NMS_VERSION = "v1_10_R1"; + public static final String COMPILE_NMS_VERSION = "v1_11_R1"; public ServerInterface(TotalFreedomMod plugin) { From 5ffbc9e8a4435c2eb8e36cda9ab611d83719b04f Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Mon, 22 May 2017 20:05:41 +0200 Subject: [PATCH 06/14] Update compile version to v1_12_R1 --- pom.xml | 4 ++-- .../totalfreedom/totalfreedommod/ServerInterface.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index 721ac5fbe..62df513ff 100644 --- a/pom.xml +++ b/pom.xml @@ -60,9 +60,9 @@ org.spigotmc spigot-server - 1.11 + 1.12 system - ${project.basedir}/lib/Spigot-1.11.jar + ${project.basedir}/lib/Spigot-1.12.jar diff --git a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java index 83ca040b0..d050790c6 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/ServerInterface.java @@ -4,16 +4,16 @@ import java.util.List; import me.totalfreedom.totalfreedommod.util.FLog; import me.totalfreedom.totalfreedommod.util.FUtil; -import net.minecraft.server.v1_11_R1.EntityPlayer; -import net.minecraft.server.v1_11_R1.MinecraftServer; -import net.minecraft.server.v1_11_R1.PropertyManager; +import net.minecraft.server.v1_12_R1.EntityPlayer; +import net.minecraft.server.v1_12_R1.MinecraftServer; +import net.minecraft.server.v1_12_R1.PropertyManager; import org.bukkit.Bukkit; -import org.bukkit.craftbukkit.v1_11_R1.CraftServer; +import org.bukkit.craftbukkit.v1_12_R1.CraftServer; public class ServerInterface extends FreedomService { - public static final String COMPILE_NMS_VERSION = "v1_11_R1"; + public static final String COMPILE_NMS_VERSION = "v1_12_R1"; public ServerInterface(TotalFreedomMod plugin) { From baf73df4f9be81f0cb39b71e6e1809425db649b8 Mon Sep 17 00:00:00 2001 From: Jerom van der Sar Date: Mon, 22 May 2017 20:13:59 +0200 Subject: [PATCH 07/14] Added /adventure, removed /spectator --- .../command/Command_adventure.java | 56 +++++++++++++++++++ .../command/Command_spectator.java | 21 ------- 2 files changed, 56 insertions(+), 21 deletions(-) create mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java delete mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java new file mode 100644 index 000000000..d77d316bb --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java @@ -0,0 +1,56 @@ +package me.totalfreedom.totalfreedommod.command; + +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FUtil; +import org.bukkit.GameMode; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.BOTH) +@CommandParameters(description = "Quickly change your own gamemode to adventure, or define someone's username to change theirs.", usage = "/ <-a | [partialname]>", aliases = "gma") +public class Command_adventure extends FreedomCommand +{ + + @Override + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length == 0) + { + if (isConsole()) + { + sender.sendMessage("When used from the console, you must define a target player."); + return true; + } + + playerSender.setGameMode(GameMode.ADVENTURE); + msg("Gamemode set to adventure."); + return true; + } + + if (args[0].equals("-a")) + { + for (Player targetPlayer : server.getOnlinePlayers()) + { + targetPlayer.setGameMode(GameMode.ADVENTURE); + } + + FUtil.adminAction(sender.getName(), "Changing everyone's gamemode to adventure", false); + return true; + } + + Player player = getPlayer(args[0]); + + if (player == null) + { + sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND); + return true; + } + + msg("Setting " + player.getName() + " to game mode adventure"); + msg(player, sender.getName() + " set your game mode to adventure"); + player.setGameMode(GameMode.ADVENTURE); + + return true; + } +} diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java deleted file mode 100644 index fff9752e5..000000000 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_spectator.java +++ /dev/null @@ -1,21 +0,0 @@ -package me.totalfreedom.totalfreedommod.command; - -import me.totalfreedom.totalfreedommod.rank.Rank; -import org.bukkit.GameMode; -import org.bukkit.command.Command; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; - -@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Quickly change your own gamemode to spectator.", usage = "/", aliases = "gmsp") -public class Command_spectator extends FreedomCommand -{ - - @Override - public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) - { - playerSender.setGameMode(GameMode.SPECTATOR); - msg("Gamemode set to spectator."); - return true; - } -} From c6a2496d7227fa16a9ede398436ee680422c7016 Mon Sep 17 00:00:00 2001 From: marcocorriero Date: Mon, 29 May 2017 20:59:06 +0200 Subject: [PATCH 08/14] Fixed Module_players to include only active admins. Closes #1852 (#2036) With Madgeek's latest changes, the logviewer now pulls from the 'players' HTTPD module. This edit switch causes inactive admins to no longer have access to the log viewer. --- .../totalfreedommod/httpd/module/Module_players.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java index 902c7bdff..a8810dc71 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/httpd/module/Module_players.java @@ -36,7 +36,7 @@ public NanoHTTPD.Response getResponse() } // Admins - for (Admin admin : plugin.al.getAllAdmins().values()) + for (Admin admin : plugin.al.getActiveAdmins()) { final String username = admin.getName(); From 259142f703a4ed9266509a7a071c1496cdf7c43b Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 18:16:43 +0500 Subject: [PATCH 09/14] Add rainbow commands --- .../command/Command_rainbownick.java | 60 +++++++++++++++++++ .../command/Command_rainbowtag.java | 44 ++++++++++++++ .../totalfreedommod/util/FUtil.java | 37 +++++++++--- 3 files changed, 133 insertions(+), 8 deletions(-) create mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java create mode 100644 src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java new file mode 100644 index 000000000..09c46db14 --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbownick.java @@ -0,0 +1,60 @@ +package me.totalfreedom.totalfreedommod.command; + +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FUtil; +import org.apache.commons.lang3.StringUtils; +import org.bukkit.Bukkit; +import org.bukkit.ChatColor; +import org.bukkit.command.Command; +import org.bukkit.command.CommandSender; +import org.bukkit.entity.Player; + +@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) +@CommandParameters(description = "Essentials Interface Command - Rainbowify your nickname.", usage = "/ ") +public class Command_rainbownick extends FreedomCommand +{ + + @Override + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length != 1) + { + return false; + } + + final String nickPlain = ChatColor.stripColor(FUtil.colorize(args[0].trim())); + + if (!nickPlain.matches("^[a-zA-Z_0-9" + ChatColor.COLOR_CHAR + "]+$")) + { + msg("That nickname contains invalid characters."); + return true; + } + + if (nickPlain.length() < 4 || nickPlain.length() > 30) + { + msg("Your nickname must be between 4 and 30 characters long."); + return true; + } + + for (Player player : Bukkit.getOnlinePlayers()) + { + if (player == playerSender) + { + continue; + } + if (player.getName().equalsIgnoreCase(nickPlain) || ChatColor.stripColor(player.getDisplayName()).trim().equalsIgnoreCase(nickPlain)) + { + msg("That nickname is already in use."); + return true; + } + } + + final String newNick = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(nickPlain))); + + plugin.esb.setNickname(sender.getName(), newNick); + + msg("Your nickname is now: " + newNick); + + return true; + } +} \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java new file mode 100644 index 000000000..c389eaab8 --- /dev/null +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -0,0 +1,44 @@ +package me.totalfreedom.totalfreedommod.command; + +import java.util.Iterator; +import static me.totalfreedom.totalfreedommod.command.Command_tag.FORBIDDEN_WORDS; +import me.totalfreedom.totalfreedommod.rank.Rank; +import me.totalfreedom.totalfreedommod.util.FUtil; +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; + +@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) +@CommandParameters(description = "Gives you a rainbow tag", usage = "/ ", aliases = "tn") +public class Command_rainbowtag extends FreedomCommand +{ + + @Override + public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole) + { + if (args.length < 1) + { + return false; + } + + final String tag = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")))); + + for (String word : FORBIDDEN_WORDS) + { + if (tag.contains(word)) + { + msg("That tag contains a forbidden word."); + return true; + } + } + + plugin.pl.getPlayer(playerSender).setTag(tag); + + msg("Set tag to " + tag); + + return true; + } +} + \ No newline at end of file diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index 5a3272978..583501667 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -11,6 +11,7 @@ import java.util.Date; import java.util.GregorianCalendar; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Map; @@ -40,18 +41,19 @@ public class FUtil public static String DATE_STORAGE_FORMAT = "EEE, d MMM yyyy HH:mm:ss Z"; public static final Map CHAT_COLOR_NAMES = new HashMap<>(); public static final List CHAT_COLOR_POOL = Arrays.asList( - ChatColor.DARK_BLUE, - ChatColor.DARK_GREEN, - ChatColor.DARK_AQUA, ChatColor.DARK_RED, - ChatColor.DARK_PURPLE, + ChatColor.RED, ChatColor.GOLD, - ChatColor.BLUE, + ChatColor.YELLOW, ChatColor.GREEN, + ChatColor.DARK_GREEN, ChatColor.AQUA, - ChatColor.RED, - ChatColor.LIGHT_PURPLE, - ChatColor.YELLOW); + ChatColor.DARK_AQUA, + ChatColor.BLUE, + ChatColor.DARK_BLUE, + ChatColor.DARK_PURPLE, + ChatColor.LIGHT_PURPLE); + private static Iterator CHAT_COLOR_ITERATOR; static { @@ -368,6 +370,25 @@ public static ChatColor randomChatColor() { return CHAT_COLOR_POOL.get(RANDOM.nextInt(CHAT_COLOR_POOL.size())); } + + public static String rainbowify(String string) + { + CHAT_COLOR_ITERATOR = CHAT_COLOR_POOL.iterator(); + + final StringBuilder newString = new StringBuilder(); + final char[] chars = string.toCharArray(); + + for (char c : chars) + { + if (!CHAT_COLOR_ITERATOR.hasNext()) + { + CHAT_COLOR_ITERATOR = CHAT_COLOR_POOL.iterator(); //Restart from first colour if there are no more colours in iterator. + } + newString.append(FUtil.CHAT_COLOR_ITERATOR.next()).append(c); + } + + return newString.toString(); + } public static String colorize(String string) { From ef14c66f76deb195d861628b4ee498d0a269159e Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 18:48:08 +0500 Subject: [PATCH 10/14] Create Command_rainbowtag.java --- .../totalfreedommod/command/Command_rainbowtag.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index c389eaab8..12a0d81c1 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -11,7 +11,7 @@ import org.bukkit.entity.Player; @CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME) -@CommandParameters(description = "Gives you a rainbow tag", usage = "/ ", aliases = "tn") +@CommandParameters(description = "Gives you a rainbow tag", usage = "/ ") public class Command_rainbowtag extends FreedomCommand { @@ -41,4 +41,4 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin return true; } } - \ No newline at end of file + From 2ff09d50439e5917ac968b49e315d9590e7a5c58 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 18:49:16 +0500 Subject: [PATCH 11/14] don't import as static --- .../totalfreedommod/command/Command_rainbowtag.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index 12a0d81c1..a29c9a015 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -1,7 +1,6 @@ package me.totalfreedom.totalfreedommod.command; import java.util.Iterator; -import static me.totalfreedom.totalfreedommod.command.Command_tag.FORBIDDEN_WORDS; import me.totalfreedom.totalfreedommod.rank.Rank; import me.totalfreedom.totalfreedommod.util.FUtil; import org.apache.commons.lang3.StringUtils; @@ -25,7 +24,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin final String tag = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")))); - for (String word : FORBIDDEN_WORDS) + for (String word : Command_tag.FORBIDDEN_WORDS) { if (tag.contains(word)) { From 54cf41f5a0c9086e858dd1962cad46d919510fc9 Mon Sep 17 00:00:00 2001 From: Lemon Date: Fri, 9 Jun 2017 19:06:25 +0500 Subject: [PATCH 12/14] This is FUtil. --- src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java index 583501667..f69727b32 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/util/FUtil.java @@ -384,7 +384,7 @@ public static String rainbowify(String string) { CHAT_COLOR_ITERATOR = CHAT_COLOR_POOL.iterator(); //Restart from first colour if there are no more colours in iterator. } - newString.append(FUtil.CHAT_COLOR_ITERATOR.next()).append(c); + newString.append(CHAT_COLOR_ITERATOR.next()).append(c); } return newString.toString(); From 0a9b9f8d5b1812bf0415063fadd55baf6f3108b1 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 14 Aug 2017 09:46:23 +0500 Subject: [PATCH 13/14] Add character limit. --- .../totalfreedommod/command/Command_rainbowtag.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index a29c9a015..b46c81738 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -21,8 +21,14 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin { return false; } - - final String tag = FUtil.rainbowify(ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " ")))); + + final String tag = ChatColor.stripColor(FUtil.colorize(StringUtils.join(args, " "))); + + if(tag.length() > 20) + { + msg("That tag is too long (Max is 20 characters).); + return true; + } for (String word : Command_tag.FORBIDDEN_WORDS) { @@ -33,7 +39,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin } } - plugin.pl.getPlayer(playerSender).setTag(tag); + plugin.pl.getPlayer(playerSender).setTag(FUtil.rainbowify(tag)); msg("Set tag to " + tag); From e6598aaba33c04378e2fc8ae4b4ced2c99c2a0c1 Mon Sep 17 00:00:00 2001 From: Lemon Date: Mon, 14 Aug 2017 10:47:37 +0500 Subject: [PATCH 14/14] add double quote mark --- .../totalfreedommod/command/Command_rainbowtag.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java index b46c81738..38c8e2fe5 100644 --- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java +++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rainbowtag.java @@ -26,7 +26,7 @@ public boolean run(CommandSender sender, Player playerSender, Command cmd, Strin if(tag.length() > 20) { - msg("That tag is too long (Max is 20 characters).); + msg("That tag is too long (Max is 20 characters)."); return true; }