Fix wrong List.subList range

Andre601 · Jun 28, 2022 · 3a3a813 · 3a3a813
1 parent 3cf5f3f
commit 3a3a813
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/...d/src/main/java/com/andre601/oneversionremake/bungeecord/listener/BungeePingListener.java b/...d/src/main/java/com/andre601/oneversionremake/bungeecord/listener/BungeePingListener.java
@@ -49,7 +49,7 @@ public void onProxyPing(ProxyPingEvent event){
         int userProtocol = protocol.getProtocol();
 
         List<Integer> serverProtocols = plugin.getConfigHandler().getIntList("Protocol", "Versions");
-        List<String> hoverMessage = plugin.getConfigHandler().getStringList("Messages", "Hover");
+        List<String> hoverMessage = plugin.getConfigHandler().getStringList(false, "Messages", "Hover");
 
         if(serverProtocols.isEmpty())
             return;
@@ -59,7 +59,7 @@ public void onProxyPing(ProxyPingEvent event){
         boolean majorOnly = plugin.getConfigHandler().getBoolean(false, "Protocol", "MajorOnly");
 
         String playerCount = plugin.getConfigHandler().getString("", "Messages", "PlayerCount");
-        List<String> motd = plugin.getConfigHandler().getStringList("Messages", "Motd");
+        List<String> motd = plugin.getConfigHandler().getStringList(true, "Messages", "Motd");
 
         if(!serverProtocols.contains(userProtocol)){
             if(!hoverMessage.isEmpty()){
@@ -72,9 +72,6 @@ public void onProxyPing(ProxyPingEvent event){
                 protocol.setName(plugin.getComponentParser().toString(playerCount, serverProtocols, userProtocol, majorOnly));
 
             if(!motd.isEmpty()){
-                if(motd.size() > 2)
-                    motd = motd.subList(0, 1);
-
                 TextComponent component = new TextComponent(BungeeComponentSerializer.get().serialize(
                         plugin.getComponentParser().toComponent(motd, serverProtocols, userProtocol, majorOnly)
                 ));

diff --git a/core/src/main/java/com/andre601/oneversionremake/core/files/ConfigHandler.java b/core/src/main/java/com/andre601/oneversionremake/core/files/ConfigHandler.java
@@ -30,6 +30,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
 public class ConfigHandler{
@@ -114,12 +115,18 @@ public List<Integer> getIntList(Object... path){
         }
     }
 
-    public List<String> getStringList(Object... path){
+    public List<String> getStringList(boolean trim, Object... path){
+        List<String> list;
         try{
-            return fromPath(path).getList(String.class);
+            list = fromPath(path).getList(String.class);
         }catch(SerializationException ex){
-            return new ArrayList<>();
+            return Collections.emptyList();
         }
+
+        if(list == null)
+            return Collections.emptyList();
+
+        return (trim && list.size() > 2) ? list.subList(0, 2) : list;
     }
 
     private ConfigurationNode fromPath(Object... path){

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <plugin.version>3.11.0</plugin.version>
+        <plugin.version>3.11.1</plugin.version>
         <plugin.description>Only allow specific client versions on your Network.</plugin.description>
 
         <maven.compiler.target>11</maven.compiler.target>

diff --git a/...y/src/main/java/com/andre601/oneversionremake/velocity/listener/VelocityPingListener.java b/...y/src/main/java/com/andre601/oneversionremake/velocity/listener/VelocityPingListener.java
@@ -55,8 +55,8 @@ public void onProxyPing(ProxyPingEvent event){
         boolean majorOnly = plugin.getConfigHandler().getBoolean(false, "Protocol", "MajorOnly");
 
         String playerCount = plugin.getConfigHandler().getString("", "Messages", "PlayerCount");
-        List<String> motd = plugin.getConfigHandler().getStringList("Messages", "Motd");
-        List<String> hoverMessage = plugin.getConfigHandler().getStringList("Messages", "Hover");
+        List<String> motd = plugin.getConfigHandler().getStringList(true, "Messages", "Motd");
+        List<String> hoverMessage = plugin.getConfigHandler().getStringList(false, "Messages", "Hover");
 
         if(!serverProtocols.contains(userProtocol)){
             ServerPing.Builder builder = ping.asBuilder();
@@ -74,9 +74,6 @@ public void onProxyPing(ProxyPingEvent event){
             }
 
             if(!motd.isEmpty()){
-                if(motd.size() > 2)
-                    motd = motd.subList(0, 1);
-
                 builder.description(plugin.getComponentParser().toComponent(motd, serverProtocols, userProtocol, majorOnly));
             }