From e0b98794c5cd863eaaa44eb671655ba7c2640550 Mon Sep 17 00:00:00 2001
From: Telesphoreo <me@telesphoreo.me>
Date: Thu, 27 Jan 2022 15:22:28 -0600
Subject: [PATCH] Fix exception messages displaying twice

---
 .../java/dev/plex/command/PlexCommand.java    | 38 ++++++++++---------
 .../java/dev/plex/rank/DefaultRankObj.java    |  3 +-
 .../plex/world/BlockMapChunkGenerator.java    |  5 +--
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/main/java/dev/plex/command/PlexCommand.java b/src/main/java/dev/plex/command/PlexCommand.java
index 5ba3ea7..b899ab7 100644
--- a/src/main/java/dev/plex/command/PlexCommand.java
+++ b/src/main/java/dev/plex/command/PlexCommand.java
@@ -1,6 +1,5 @@
 package dev.plex.command;
 
-import com.google.common.collect.ImmutableList;
 import dev.plex.Plex;
 import dev.plex.cache.DataUtils;
 import dev.plex.cache.PlayerCache;
@@ -15,20 +14,21 @@ import dev.plex.command.source.RequiredCommandSource;
 import dev.plex.player.PlexPlayer;
 import dev.plex.rank.enums.Rank;
 import dev.plex.util.PlexUtils;
+import java.util.Arrays;
+import java.util.UUID;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.World;
-import org.bukkit.command.*;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandMap;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
-
 public abstract class PlexCommand extends Command
 {
     protected static Plex plugin = Plex.get();
@@ -103,18 +103,11 @@ public abstract class PlexCommand extends Command
         {
             send(sender, getUsage().replace("<command>", getLabel()));
         }
-        catch (PlayerNotFoundException | CommandFailException ex)
+        catch (PlayerNotFoundException | CommandFailException
+                | ConsoleOnlyException | ConsoleMustDefinePlayerException ex)
         {
             send(sender, ex.getMessage());
         }
-        catch (ConsoleMustDefinePlayerException ex)
-        {
-            send(sender, tl("consoleMustDefinePlayer"));
-        }
-        catch (ConsoleOnlyException ex)
-        {
-            send(sender, tl("consoleOnly"));
-        }
         return true;
     }
 
@@ -161,7 +154,10 @@ public abstract class PlexCommand extends Command
 
     protected boolean isAdmin(CommandSender sender)
     {
-        if (!(sender instanceof Player player)) return true;
+        if (!(sender instanceof Player player))
+        {
+            return true;
+        }
         PlexPlayer plexPlayer = getPlexPlayer(player);
         return Plex.get().getRankManager().isAdmin(plexPlayer);
     }
@@ -174,14 +170,20 @@ public abstract class PlexCommand extends Command
 
     protected boolean isSeniorAdmin(CommandSender sender)
     {
-        if (!(sender instanceof Player player)) return true;
+        if (!(sender instanceof Player player))
+        {
+            return true;
+        }
         PlexPlayer plexPlayer = getPlexPlayer(player);
         return Plex.get().getRankManager().isSeniorAdmin(plexPlayer);
     }
 
     protected UUID getUUID(CommandSender sender)
     {
-        if (!(sender instanceof Player player)) return null;
+        if (!(sender instanceof Player player))
+        {
+            return null;
+        }
         return player.getUniqueId();
     }
 
diff --git a/src/main/java/dev/plex/rank/DefaultRankObj.java b/src/main/java/dev/plex/rank/DefaultRankObj.java
index ca72a9b..2bddcce 100644
--- a/src/main/java/dev/plex/rank/DefaultRankObj.java
+++ b/src/main/java/dev/plex/rank/DefaultRankObj.java
@@ -2,9 +2,8 @@ package dev.plex.rank;
 
 import com.google.common.collect.Lists;
 import dev.plex.rank.enums.Rank;
-import lombok.Getter;
-
 import java.util.List;
+import lombok.Getter;
 
 @Getter
 public class DefaultRankObj
diff --git a/src/main/java/dev/plex/world/BlockMapChunkGenerator.java b/src/main/java/dev/plex/world/BlockMapChunkGenerator.java
index 43d8f0b..8c3f498 100644
--- a/src/main/java/dev/plex/world/BlockMapChunkGenerator.java
+++ b/src/main/java/dev/plex/world/BlockMapChunkGenerator.java
@@ -1,10 +1,9 @@
 package dev.plex.world;
 
-import org.bukkit.Material;
-import org.bukkit.generator.BlockPopulator;
-
 import java.util.LinkedHashMap;
 import java.util.Map;
+import org.bukkit.Material;
+import org.bukkit.generator.BlockPopulator;
 
 public class BlockMapChunkGenerator extends FlatChunkGenerator
 {