Added screen line bug fix and changed version string to 2.1.14.1

Author: Tarek

Jenkinsfile

@@ -15,7 +15,7 @@ pipeline {
     }
     stage('Version') {
       steps {
-        sh 'mvn versions:set -DnewVersion=2.1.14'
+        sh 'mvn versions:set -DnewVersion=2.1.14.1'
       }
     }
     stage('Compile') {

cloudnet-core/src/main/java/de/dytanic/cloudnetcore/network/packet/in/PacketInSendScreenLine.java

@@ -13,20 +13,24 @@
 import de.dytanic.cloudnetcore.api.event.server.ScreenInfoEvent;
 import de.dytanic.cloudnetcore.network.components.INetworkComponent;
 
+import java.lang.reflect.Type;
 import java.util.Collection;
 
-public class PacketInSendScreenLine extends PacketInHandler {
+public final class PacketInSendScreenLine extends PacketInHandler {
+
+    private static final Type TYPE = new TypeToken<Collection<ScreenInfo>>() {
+    }.getType();
 
     @Override
     public void handleInput(Document data, PacketSender packetSender)
     {
-        Collection<ScreenInfo> screenInfos = data.getObject("screenInfo", new TypeToken<Collection<ScreenInfo>>() {
-        }.getType());
+        Collection<ScreenInfo> screenInfos = data.getObject("screenInfo", TYPE);
         CloudNet.getInstance().getEventManager().callEvent(new ScreenInfoEvent(screenInfos));
 
         for (ScreenInfo screenInfo : screenInfos)
         {
-            if (CloudNet.getInstance().getScreenProvider().getMainServiceId() != null && screenInfo.getServiceId().getServerId().equalsIgnoreCase(CloudNet.getInstance().getScreenProvider().getMainServiceId().getServerId()))
+            if (CloudNet.getInstance().getScreenProvider().getMainServiceId() != null &&
+                    screenInfo.getServiceId().getServerId().equalsIgnoreCase(CloudNet.getInstance().getScreenProvider().getMainServiceId().getServerId()))
                 System.out.println("[" + screenInfo.getServiceId().getServerId() + "] " + screenInfo.getLine());
         }
 

cloudnet-core/src/main/java/de/dytanic/cloudnetcore/serverlog/ServerLogManager.java

@@ -13,6 +13,7 @@
 import lombok.Getter;
 
 import java.util.Collection;
+import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 /**
@@ -21,7 +22,7 @@
 @Getter
 public final class ServerLogManager implements Runnable {
 
-    private final NetorHashMap<String, MultiValue<String, Long>, Collection<ScreenInfo>> screenInfos = new NetorHashMap<>();
+    private final NetorHashMap<String, MultiValue<String, Long>, Queue<ScreenInfo>> screenInfos = new NetorHashMap<>();
 
     public void append(String rnd, String serverId)
     {
@@ -60,9 +61,11 @@ public void appendScreenData(Collection<ScreenInfo> screenInfos)
                     if (this.screenInfos.getF(key).getFirst().equalsIgnoreCase(screenInfo.getServiceId().getServerId()))
                     {
                         this.screenInfos.getS(key).addAll(screenInfos);
+
+                        while (this.screenInfos.getS(key).size() > 64)
+                            this.screenInfos.getS(key).poll();
                     }
                 }
-                break;
             }
     }
 

pom.xml

@@ -18,7 +18,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.build.targetEncoding>UTF-8</project.build.targetEncoding>
-        <service.version>2.1.14</service.version>
+        <service.version>2.1.14.1</service.version>
         <service.type>RELEASE</service.type>
         <!-- Dependencies -->
         <dependency.lombok.version>1.18.4</dependency.lombok.version>