some small optimizings in signs system

Dytanic · Dytanic · commit fad7d4572418 · 2018-10-06T13:29:32.000+02:00
diff --git a/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/serverselectors/SignSelector.java b/cloudnet-api/cloudnet-api-bridge/src/main/java/de/dytanic/cloudnet/bridge/internal/serverselectors/SignSelector.java
@@ -126,7 +126,7 @@ private Sign findFreeSign(String group)
             @Override
             public boolean isAccepted(Sign value)
             {
-                return value.getTargetGroup().equals(value) && value.getServerInfo() != null;
+                return value.getTargetGroup().equals(group) && value.getServerInfo() == null;
             }
         });
     }
@@ -169,6 +169,7 @@ public Collection<String> freeServers(String group)
 
         for (String b : x) servers.remove(b);
 
+        Collections.sort(servers);
         return servers;
     }
 
@@ -242,7 +243,8 @@ public boolean isAccepted(Sign value)
     }
 
     private class ThreadImpl extends Thread {
-        public int animationTick = 1;
+
+        int animationTick = 1;
         private boolean valueTick = false;
 
         @Override
@@ -657,7 +659,7 @@ public void onServerAdd(ServerInfo serverInfo)
                 {
                     sign.setServerInfo(serverInfo);
                     Location location = toLocation(sign.getPosition());
-                    if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())
+                    if (serverInfo.isOnline() && !serverInfo.isIngame())
                     {
                         if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) || serverInfo.getServerConfig().isHideServer())
                         {
@@ -707,7 +709,7 @@ public void onServerAdd(ServerInfo serverInfo)
 
                     Sign next = findFreeSign(serverInfo.getServiceId().getGroup());
                     Location location = toLocation(next.getPosition());
-                    if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())
+                    if (serverInfo.isOnline() && !serverInfo.isIngame())
                     {
                         if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) || serverInfo.getServerConfig().isHideServer())
                         {
@@ -760,7 +762,7 @@ public void onServerAdd(ServerInfo serverInfo)
                     if (exists(newSign))
                     {
                         Location location = toLocation(newSign.getPosition());
-                        if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())
+                        if (serverInfo.isOnline() && !serverInfo.isIngame())
                         {
                             if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) || serverInfo.getServerConfig().isHideServer())
                             {
@@ -845,7 +847,7 @@ public void run()
                             {
                                 sign.setServerInfo(serverInfo);
                                 Location location = toLocation(sign.getPosition());
-                                if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())
+                                if (serverInfo.isOnline() && !serverInfo.isIngame())
                                 {
                                     if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) || serverInfo.getServerConfig().isHideServer())
                                     {
@@ -889,7 +891,7 @@ public void run()
 
                                 Sign next = findFreeSign(serverInfo.getServiceId().getGroup());
                                 Location location = toLocation(next.getPosition());
-                                if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())
+                                if (serverInfo.isOnline() && !serverInfo.isIngame())
                                 {
                                     if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) || serverInfo.getServerConfig().isHideServer())
                                     {
@@ -933,7 +935,7 @@ public void run()
                                 if (exists(newSign))
                                 {
                                     Location location = toLocation(newSign.getPosition());
-                                    if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())
+                                    if (serverInfo.isOnline() && !serverInfo.isIngame())
                                     {
                                         if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) || serverInfo.getServerConfig().isHideServer())
                                         {
diff --git a/cloudnet-lib/src/main/java/de/dytanic/cloudnet/lib/serverselectors/sign/Sign.java b/cloudnet-lib/src/main/java/de/dytanic/cloudnet/lib/serverselectors/sign/Sign.java
@@ -17,7 +17,7 @@ public class Sign {
     private Position position;
 
     @Setter
-    private ServerInfo serverInfo;
+    private volatile ServerInfo serverInfo;
 
     public Sign(String targetGroup, Position signPosition)
     {

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ private Sign findFreeSign(String group)`
`126`	`126`	`@Override`
`127`	`127`	`public boolean isAccepted(Sign value)`
`128`	`128`	`{`
`129`		`- return value.getTargetGroup().equals(value) && value.getServerInfo() != null;`
	`129`	`+ return value.getTargetGroup().equals(group) && value.getServerInfo() == null;`
`130`	`130`	`}`
`131`	`131`	`});`
`132`	`132`	`}`
`@@ -169,6 +169,7 @@ public Collection<String> freeServers(String group)`
`169`	`169`
`170`	`170`	`for (String b : x) servers.remove(b);`
`171`	`171`
	`172`	`+ Collections.sort(servers);`
`172`	`173`	`return servers;`
`173`	`174`	`}`
`174`	`175`
`@@ -242,7 +243,8 @@ public boolean isAccepted(Sign value)`
`242`	`243`	`}`
`243`	`244`
`244`	`245`	`private class ThreadImpl extends Thread {`
`245`		`- public int animationTick = 1;`
	`246`	`+`
	`247`	`+ int animationTick = 1;`
`246`	`248`	`private boolean valueTick = false;`
`247`	`249`
`248`	`250`	`@Override`
`@@ -657,7 +659,7 @@ public void onServerAdd(ServerInfo serverInfo)`
`657`	`659`	`{`
`658`	`660`	`sign.setServerInfo(serverInfo);`
`659`	`661`	`Location location = toLocation(sign.getPosition());`
`660`		`- if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())`
	`662`	`+ if (serverInfo.isOnline() && !serverInfo.isIngame())`
`661`	`663`	`{`
`662`	`664`	`if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) \|\| serverInfo.getServerConfig().isHideServer())`
`663`	`665`	`{`
`@@ -707,7 +709,7 @@ public void onServerAdd(ServerInfo serverInfo)`
`707`	`709`
`708`	`710`	`Sign next = findFreeSign(serverInfo.getServiceId().getGroup());`
`709`	`711`	`Location location = toLocation(next.getPosition());`
`710`		`- if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())`
	`712`	`+ if (serverInfo.isOnline() && !serverInfo.isIngame())`
`711`	`713`	`{`
`712`	`714`	`if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) \|\| serverInfo.getServerConfig().isHideServer())`
`713`	`715`	`{`
`@@ -760,7 +762,7 @@ public void onServerAdd(ServerInfo serverInfo)`
`760`	`762`	`if (exists(newSign))`
`761`	`763`	`{`
`762`	`764`	`Location location = toLocation(newSign.getPosition());`
`763`		`- if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())`
	`765`	`+ if (serverInfo.isOnline() && !serverInfo.isIngame())`
`764`	`766`	`{`
`765`	`767`	`if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) \|\| serverInfo.getServerConfig().isHideServer())`
`766`	`768`	`{`
`@@ -845,7 +847,7 @@ public void run()`
`845`	`847`	`{`
`846`	`848`	`sign.setServerInfo(serverInfo);`
`847`	`849`	`Location location = toLocation(sign.getPosition());`
`848`		`- if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())`
	`850`	`+ if (serverInfo.isOnline() && !serverInfo.isIngame())`
`849`	`851`	`{`
`850`	`852`	`if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) \|\| serverInfo.getServerConfig().isHideServer())`
`851`	`853`	`{`
`@@ -889,7 +891,7 @@ public void run()`
`889`	`891`
`890`	`892`	`Sign next = findFreeSign(serverInfo.getServiceId().getGroup());`
`891`	`893`	`Location location = toLocation(next.getPosition());`
`892`		`- if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())`
	`894`	`+ if (serverInfo.isOnline() && !serverInfo.isIngame())`
`893`	`895`	`{`
`894`	`896`	`if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) \|\| serverInfo.getServerConfig().isHideServer())`
`895`	`897`	`{`
`@@ -933,7 +935,7 @@ public void run()`
`933`	`935`	`if (exists(newSign))`
`934`	`936`	`{`
`935`	`937`	`Location location = toLocation(newSign.getPosition());`
`936`		`- if (serverInfo != null && serverInfo.isOnline() && !serverInfo.isIngame())`
	`938`	`+ if (serverInfo.isOnline() && !serverInfo.isIngame())`
`937`	`939`	`{`
`938`	`940`	`if ((signLayoutConfig.isFullServerHide() && serverInfo.getOnlineCount() >= serverInfo.getMaxPlayers()) \|\| serverInfo.getServerConfig().isHideServer())`
`939`	`941`	`{`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public class Sign {`
`17`	`17`	`private Position position;`
`18`	`18`
`19`	`19`	`@Setter`
`20`		`- private ServerInfo serverInfo;`
	`20`	`+ private volatile ServerInfo serverInfo;`
`21`	`21`
`22`	`22`	`public Sign(String targetGroup, Position signPosition)`
`23`	`23`	`{`