Merge pull request #44 from Andre601/feature/improve-velocity-ping-code

Use ServerPing#asBuilder for pre-set values.
Andre601 · Apr 7, 2021 · 6144a1f · 6144a1f
2 parents 593b55a + 8488ddf
commit 6144a1f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <plugin.version>3.3.2</plugin.version>
+        <plugin.version>3.3.3</plugin.version>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
     </properties>

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
@@ -48,7 +48,6 @@ public void onProxyPing(ProxyPingEvent event){
         int userProtocol = protocolVersion.getProtocol();
 
         List<Integer> serverProtocols = plugin.getConfigHandler().getIntList("Protocol", "Versions");
-        List<String> hoverMessage = plugin.getConfigHandler().getStringList("Messages", "Hover");
 
         if(serverProtocols.isEmpty())
             return;
@@ -59,9 +58,10 @@ public void onProxyPing(ProxyPingEvent event){
 
         String playerCount = plugin.getConfigHandler().getString("", "Messages", "PlayerCount");
         List<String> motd = plugin.getConfigHandler().getStringList("Messages", "Motd");
+        List<String> hoverMessage = plugin.getConfigHandler().getStringList("Messages", "Hover");
 
         if(!serverProtocols.contains(userProtocol)){
-            ServerPing.Builder builder = ServerPing.builder();
+            ServerPing.Builder builder = ping.asBuilder();
 
             if(!hoverMessage.isEmpty())
                 builder.samplePlayers(getSamplePlayers(hoverMessage, serverProtocols, userProtocol, majorOnly));
@@ -77,13 +77,8 @@ public void onProxyPing(ProxyPingEvent event){
                     motd = motd.subList(0, 1);
 
                 builder.description(Parser.toTextComponent(motd, serverProtocols, userProtocol, majorOnly));
-            }else{
-                builder.description(ping.getDescriptionComponent());
             }
 
-            // Prevents breaking favicons
-            ping.getFavicon().ifPresent(builder::favicon);
-
             event.setPing(builder.build());
         }
     }