patch

Author: espidev

src/main/java/net/estinet/gFeatures/ClioteSky/ClioteSky.java

@@ -110,20 +110,20 @@ public static byte[] stringToBytes(String str) {
     private ClioteSkyServiceGrpc.ClioteSkyServiceBlockingStub blockingStub;
     private ClioteSkyServiceGrpc.ClioteSkyServiceStub asyncStub;
     public boolean continueEventLoop = true;
-    public boolean offline = false;
+    private boolean offline = false, slowCheck = true;
 
-    private String authToken;
+    private String authToken = "";
 
     public ClioteSky(String host, int port) {
         //this(ManagedChannelBuilder.forAddress(host, port));
 
+        initConnection(host, port);
+    }
+
+    private void initConnection(String host, int port) {
         if(!checkTLS) {
             // Create all-trusting host name verifier
-            HostnameVerifier allHostsValid = new HostnameVerifier() {
-                public boolean verify(String hostname, SSLSession session) {
-                    return true;
-                }
-            };
+            HostnameVerifier allHostsValid = (hostname, session) -> true;
             // Install the all-trusting host verifier
             HttpsURLConnection.setDefaultHostnameVerifier(allHostsValid);
             try {
@@ -171,10 +171,14 @@ public void startEventLoop() {
             int speedupCount = 0;
 
             while (continueEventLoop) {
+
                 Iterator<ClioteSkyRPC.ClioteMessage> iterator;
 
                 try {
                     iterator = blockingStub.request(ClioteSkyRPC.Token.newBuilder().setToken(authToken).build());
+
+                    slowCheck = false; //the server is online
+
                     while (iterator.hasNext()) {
                         speedup = true;
                         speedupCount = 0;
@@ -207,6 +211,12 @@ public void startEventLoop() {
                     if (e.getStatus().getDescription().equals("invalid authentication token")) {
                         start();
                     }
+                } catch (NullPointerException e) { // if the initial connection couldn't be reached on server start
+                    if (Listeners.debug) {
+                        Bukkit.getLogger().severe("Can't establish connection with server. Attempting again...");
+                        e.printStackTrace();
+                    }
+                    initConnection(ClioteSky.address, Integer.parseInt(ClioteSky.port));
                 }
 
                 if (speedupCount < 20) {
@@ -216,6 +226,9 @@ public void startEventLoop() {
                 }
 
                 try {
+                    if(slowCheck) {
+                        Thread.sleep(2000);
+                    }
                     if (speedup) {
                         Thread.sleep(200);
                     } else {