Plugin: fix compilation warns

Flectone · Jul 27, 2023 · 6b3b2a7 · 6b3b2a7
1 parent a524ab0
commit 6b3b2a7
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 29 deletions.
diff --git a/src/main/java/net/flectone/custom/FCommands.java b/src/main/java/net/flectone/custom/FCommands.java
@@ -31,7 +31,7 @@ public class FCommands {
 
     private final boolean isConsole;
     private final String alias;
-    private Player player = null;
+    private final Player player;
     private boolean isHaveCD = false;
 
     public FCommands(CommandSender sender, String command, String label, String[] args) {
@@ -210,7 +210,7 @@ public void sendGlobalMessage(Set<Player> recipientsSet, String format, String m
     }
 
     private Set<Player> getFilteredPlayers() {
-        if (Main.config.getString("command." + command + ".global") != null
+        if (!Main.config.getString("command." + command + ".global").isEmpty()
                 && !Main.config.getBoolean("command." + command + ".global")
                 && !isConsole) {
 

diff --git a/src/main/java/net/flectone/custom/FPlayer.java b/src/main/java/net/flectone/custom/FPlayer.java
@@ -411,7 +411,7 @@ public void setWorldPrefix(World world) {
                     : world.getName().toLowerCase();
 
             this.worldPrefix = Main.locale.getString("player.world.prefix." + worldType);
-            if (this.worldPrefix == null) {
+            if (this.worldPrefix.isEmpty()) {
                 Main.warning("The prefix for " + worldType + " could not be determined");
                 this.worldPrefix = Main.locale.getString("player.world.prefix.normal");
             }

diff --git a/src/main/java/net/flectone/integrations/expansions/FExpansion.java b/src/main/java/net/flectone/integrations/expansions/FExpansion.java
@@ -34,46 +34,27 @@ public boolean persist() {
 
     @Override
     public String onRequest(OfflinePlayer player, String params) {
+        if (player == null || !player.isOnline()) return "";
 
-        if (params.equalsIgnoreCase("stream_prefix")) {
-
-            if (player == null || !player.isOnline()) return "";
-
-            FPlayer fPlayer = FPlayerManager.getPlayer(player);
+        FPlayer fPlayer = FPlayerManager.getPlayer(player);
 
+        if (params.equalsIgnoreCase("stream_prefix")) {
             return ObjectUtil.translateHexToColor(fPlayer.getStreamPrefix());
         }
 
         if (params.equalsIgnoreCase("afk_suffix")) {
-
-            if (player == null || !player.isOnline()) return "";
-
-            FPlayer fPlayer = FPlayerManager.getPlayer(player);
-
             return ObjectUtil.translateHexToColor(fPlayer.getAfkSuffix());
         }
 
         if (params.equalsIgnoreCase("world_prefix")) {
-            if (player == null || !player.isOnline()) return "";
-
-            FPlayer fPlayer = FPlayerManager.getPlayer(player);
-
             return ObjectUtil.translateHexToColor(fPlayer.getWorldPrefix());
         }
 
         if (params.equalsIgnoreCase("player_display_name")) {
-            if (player == null || !player.isOnline()) return "";
-
-            FPlayer fPlayer = FPlayerManager.getPlayer(player);
-
             return fPlayer.getDisplayName();
         }
 
         if (params.equalsIgnoreCase("player_tab_name")) {
-            if (player == null || !player.isOnline()) return "";
-
-            FPlayer fPlayer = FPlayerManager.getPlayer(player);
-
             return fPlayer.getTabName();
         }
 

diff --git a/src/main/java/net/flectone/managers/FileManager.java b/src/main/java/net/flectone/managers/FileManager.java
@@ -65,8 +65,8 @@ public Set<String> getKeys() {
         return fileConfiguration.getKeys(true);
     }
 
-
-    public List<String> getStringList(String path) {
+    @NotNull
+    public List<String> getStringList(@NotNull String path) {
         return fileConfiguration.getStringList(path);
     }
 
@@ -79,9 +79,12 @@ public void setFileConfiguration(FileConfiguration fileConfiguration) {
         this.fileConfiguration = fileConfiguration;
     }
 
+    @NotNull
     @Override
     public String getString(@NotNull String string) {
-        return fileConfiguration.getString(string);
+        string = fileConfiguration.getString(string);
+        if(string == null) string = "";
+        return string;
     }
 
     @Override

diff --git a/src/main/java/net/flectone/messages/MessageBuilder.java b/src/main/java/net/flectone/messages/MessageBuilder.java
@@ -23,7 +23,7 @@
 
 public class MessageBuilder {
 
-    private static final Pattern urlPattern = Pattern.compile("((https?|ftp|gopher|telnet|file):((//)|(\\\\))+[\\w:#@%/;$()~_?\\+-=\\\\\\.&]*)", Pattern.CASE_INSENSITIVE);
+    private static final Pattern urlPattern = Pattern.compile("((https?|ftp|gopher|telnet|file):((//)|(\\\\))+[\\w:#@%/;$()~_?+-=\\\\.&]*)", Pattern.CASE_INSENSITIVE);
     private static final HashMap<String, String> patternMap = new HashMap<>();
 
     static {