Inconsistency and Ridiculous Bug Corrections (#189)

2024-12-27 20:27:37 +00:00 · 2020-03-16 18:58:44 -06:00 · 2020-03-16 18:58:44 -06:00 · 48ee7b0e6d
commit 48ee7b0e6d
parent c94ce6b276
24 changed files with 42 additions and 28 deletions
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_adventure.java
@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Quickly change your own gamemode to adventure, or define someone's username to change theirs.", usage = "/<command> <[partialname] | -a>", aliases = "gms")
+@CommandParameters(description = "Quickly change your own gamemode to adventure, or define someone's username to change theirs.", usage = "/<command> <[partialname] | -a>", aliases = "gma")
 public class Command_adventure extends FreedomCommand
 {

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_cartsit.java
@ -21,7 +21,7 @@ public class Command_cartsit extends FreedomCommand

            targetPlayer = getPlayer(args[0]);

-            if (targetPlayer == null)
+            if (targetPlayer == null || Command_vanish.VANISHED.contains(targetPlayer) && !plugin.al.isAdmin(sender))
            {
                sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
                return true;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_consolesay.java
@ -1,8 +1,11 @@
 package me.totalfreedom.totalfreedommod.command;

+import me.totalfreedom.totalfreedommod.config.ConfigEntry;
 import me.totalfreedom.totalfreedommod.rank.Rank;
 import me.totalfreedom.totalfreedommod.util.FUtil;
 import org.apache.commons.lang.StringUtils;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@ -22,6 +25,12 @@ public class Command_consolesay extends FreedomCommand

        String message = StringUtils.join(args, " ");
        FUtil.bcastMsg(String.format("§7[CONSOLE] §f<§c%s§f> %s", sender.getName(), StringUtils.join(args, " ")));
+
+        // Send the message to Discord
+        if (!ConfigEntry.ADMIN_ONLY_MODE.getBoolean() && !Bukkit.hasWhitelist())
+        {
+            plugin.dc.messageChatChannel("[CONSOLE] " + sender.getName() + " \u00BB " + ChatColor.stripColor(message));
+        }
        return true;
    }
 }
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ender.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ender.java
@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Goto the ender / \"The End\".", usage = "/<command>")
+@CommandParameters(description = "Go to \"The End\".", usage = "/<command>")
 public class Command_ender extends FreedomCommand
 {

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_flatlands.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_flatlands.java
@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Goto the flatlands.", usage = "/<command>")
+@CommandParameters(description = "Go to the Flatlands.", usage = "/<command>")
 public class Command_flatlands extends FreedomCommand
 {

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_gtfo.java
@ -168,9 +168,6 @@ public class Command_gtfo extends FreedomCommand

        // Broadcast
        final StringBuilder bcast = new StringBuilder()
-                .append(ChatColor.RED)
-                .append(sender.getName())
-                .append(" - ")
                .append("Banning: ")
                .append(username);
        if (reason != null)
@ -178,7 +175,7 @@ public class Command_gtfo extends FreedomCommand
            bcast.append(" - Reason: ").append(ChatColor.YELLOW).append(reason);
        }
        playerMsg(sender, ChatColor.GRAY + username + " has been banned and IP is: " + StringUtils.join(ips, ", "));
-        FUtil.bcastMsg(bcast.toString());
+        FUtil.adminAction(sender.getName(), String.format(bcast.toString()), true);

        // Kick player and handle others on IP
        if (player != null)
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_hubworld.java
@ -13,7 +13,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Go to the MasterBuilderWorld.",
+@CommandParameters(description = "Go to the HubWorld.",
        usage = "/<command> [time <morning | noon | evening | night> | weather <off | rain | storm>]",
        aliases = "hw,hworld")
 public class Command_hubworld extends FreedomCommand
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_invsee.java
@ -23,7 +23,7 @@ public class Command_invsee extends FreedomCommand

        Player player = getPlayer(args[0]);

-        if (player == null)
+        if (player == null || Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
        {
            msg("This player is not online.");
            return false;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_namehistory.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_namehistory.java
@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Check name history of username.", usage = "/<command> <username>", aliases = "nh")
+@CommandParameters(description = "Check the name history of a username.", usage = "/<command> <username>", aliases = "nh")
 public class Command_namehistory extends FreedomCommand
 {
    @Override
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nether.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nether.java
@ -6,7 +6,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Goto the nether.", usage = "/<command>")
+@CommandParameters(description = "Go to the Nether.", usage = "/<command>")
 public class Command_nether extends FreedomCommand
 {

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_nickfilter.java
@ -41,11 +41,11 @@ public class Command_nickfilter extends FreedomCommand

                    player = getPlayerByDisplayName(displayName);

-                    if (player == null)
+                    if (player == null || Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
                    {
                        player = getPlayerByDisplayNameAlt(displayName);

-                        if (player == null)
+                        if (player == null || Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
                        {
                            sender.sendMessage(ChatColor.GRAY + "Can't find player by nickname: " + displayName);
                            return true;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_op.java
@ -37,8 +37,8 @@ public class Command_op extends FreedomCommand
            }
        }

-        // if the player is not online
-        if (player == null)
+        // if the player is not online or is vanished
+        if (player == null || Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
        {
            if (plugin.al.isAdmin(sender) || senderIsConsole)
            {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ops.java
@ -8,7 +8,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.OP, source = SourceType.BOTH)
-@CommandParameters(description = "Manager operators", usage = "/<command> <count | purge>")
+@CommandParameters(description = "Manage operators", usage = "/<command> <count | purge>")
 public class Command_ops extends FreedomCommand
 {

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plotworld.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_plotworld.java
@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.NON_OP, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Goto the plot world", usage = "/<command>", aliases = "pw")
+@CommandParameters(description = "Go to the PlotWorld.", usage = "/<command>", aliases = "pw")
 public class Command_plotworld extends FreedomCommand
 {

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potion.java
@ -62,7 +62,7 @@ public class Command_potion extends FreedomCommand
                {
                    target = getPlayer(args[1]);

-                    if (target == null)
+                    if (target == null || Command_vanish.VANISHED.contains(target) && !plugin.al.isAdmin(sender))
                    {
                        msg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
                        return true;
@ -103,10 +103,9 @@ public class Command_potion extends FreedomCommand

                if (args.length == 5)
                {
-
                    target = getPlayer(args[4]);

-                    if (target == null)
+                    if (target == null || Command_vanish.VANISHED.contains(target) && !plugin.al.isAdmin(sender))
                    {
                        msg(FreedomCommand.PLAYER_NOT_FOUND, ChatColor.RED);
                        return true;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_potionspy.java
@ -7,7 +7,7 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

@CommandPermissions(level = Rank.SUPER_ADMIN, source = SourceType.ONLY_IN_GAME)
-@CommandParameters(description = "Toggles potion spy.", usage = "/<command>", aliases = "potspy")
+@CommandParameters(description = "Toggles PotionSpy.", usage = "/<command>", aliases = "potspy")
 public class Command_potionspy extends FreedomCommand
 {

--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qdeop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qdeop.java
@ -35,7 +35,7 @@ public class Command_qdeop extends FreedomCommand
        {
            if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
            {
-                if (player.isOp())
+                if (player.isOp() && !Command_vanish.VANISHED.contains(player))
                {
                    matchedPlayerNames.add(player.getName());
                    player.setOp(false);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qop.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_qop.java
@ -35,7 +35,7 @@ public class Command_qop extends FreedomCommand
        {
            if (player.getName().toLowerCase().contains(targetName) || player.getDisplayName().toLowerCase().contains(targetName))
            {
-                if (!player.isOp())
+                if (!player.isOp() && !Command_vanish.VANISHED.contains(player))
                {
                    matchedPlayerNames.add(player.getName());
                    player.setOp(true);
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rank.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_rank.java
@ -37,7 +37,7 @@ public class Command_rank extends FreedomCommand

        final Player player = getPlayer(args[0]);

-        if (player == null)
+        if (player == null || Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
        {
            sender.sendMessage(FreedomCommand.PLAYER_NOT_FOUND);
            return true;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_report.java
@ -23,7 +23,7 @@ public class Command_report extends FreedomCommand

        Player player = getPlayer(args[0]);

-        if (player == null)
+        if (player == null || Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
        {
            msg(PLAYER_NOT_FOUND);
            return true;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_ride.java
@ -84,7 +84,7 @@ public class Command_ride extends FreedomCommand
        }

        final Player player = getPlayer(args[0]);
-        if (player == null)
+        if (player == null || Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
        {
            msg(PLAYER_NOT_FOUND);
            return true;
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_tag.java
@ -53,6 +53,10 @@ public class Command_tag extends FreedomCommand

                for (final Player player : server.getOnlinePlayers())
                {
+                    if (Command_vanish.VANISHED.contains(player) && !plugin.al.isAdmin(sender))
+                    {
+                        continue;
+                    }
                    final FPlayer playerdata = plugin.pl.getPlayer(player);
                    if (playerdata.getTag() != null)
                    {
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whohas.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_whohas.java
@ -40,6 +40,10 @@ public class Command_whohas extends FreedomCommand

        for (final Player player : server.getOnlinePlayers())
        {
+            if (!plugin.al.isAdmin(sender) && Command_vanish.VANISHED.contains(player))
+            {
+                continue;
+            }
            if (player.getInventory().contains(material))
            {
                players.add(player.getName());
--- a/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wildcard.java
+++ b/src/main/java/me/totalfreedom/totalfreedommod/command/Command_wildcard.java
@ -18,7 +18,8 @@ public class Command_wildcard extends FreedomCommand
            "wildcard",
            "gtfo",
            "doom",
-            "saconfig"
+            "saconfig",
+            "smite"
    );

    @Override