Bugfix -> Added Identifier for fixing false tracking + logging bug fix

src/main/java/de/cubeattack/neoprotect/bungee/NeoProtectBungee.java

@@ -64,6 +64,11 @@ public Stats getStats() {
         );
     }
 
+    @Override
+    public String getServerAddress() {
+        return getProxy().getConfig().getListeners().stream().findFirst().orElseThrow(null).getSocketAddress().toString();
+    }
+
     @Override
     public void sendMessage(Object receiver, String text) {
         sendMessage(receiver, text, null, null, null, null);

src/main/java/de/cubeattack/neoprotect/core/Core.java

@@ -28,6 +28,7 @@ public class Core {
     private final RestAPIRequests restAPIRequests;
     private final NeoProtectPlugin plugin;
     private final Localization localization;
+    private final boolean isJPremiumInstalled;
     private final List<Object> playerInSetup = new ArrayList<>();
     private final List<String> directConnectWhitelist= new ArrayList<>();
     private final ConcurrentHashMap<KeepAliveResponseKey, Long> pingMap = new ConcurrentHashMap<>();
@@ -41,6 +42,7 @@ public Core(NeoProtectPlugin plugin) {
         LogManager.getLogger().setLogger(plugin.getLogger());
 
         this.plugin = plugin;
+        this.isJPremiumInstalled = plugin.getPlugins().contains("JPremium");
         this.versionResult = VersionUtils.checkVersion("NeoProtect", "NeoPlugin", "v" + plugin.getPluginVersion(), VersionUtils.UpdateSetting.DISABLED).message();
 
         FileUtils config = new FileUtils(Core.class.getResourceAsStream("/config.yml"), "plugins/NeoProtect", "config.yml", false);
@@ -132,6 +134,6 @@ public void setVersionResult(VersionUtils.Result versionResult) {
     }
 
     public boolean isPlayerMaintainer(UUID playerUUID, boolean onlineMode) {
-        return (onlineMode && playerUUID.equals(maintainerOnlineUUID)) || (!onlineMode && playerUUID.equals(maintainerOfflineeUUID));
+        return ((onlineMode || isJPremiumInstalled) && playerUUID.equals(maintainerOnlineUUID)) || ((!onlineMode || isJPremiumInstalled) && playerUUID.equals(maintainerOfflineeUUID));
     }
 }

src/main/java/de/cubeattack/neoprotect/core/NeoProtectPlugin.java

@@ -23,6 +23,8 @@ public interface NeoProtectPlugin {
 
     Logger getLogger();
 
+    String getServerAddress();
+
     ArrayList<String> getPlugins();
 
     PluginType getPluginType();

src/main/java/de/cubeattack/neoprotect/core/request/RestAPIManager.java

@@ -41,7 +41,7 @@ protected Response callRequest(Request request) {
         try {
             return client.newCall(request).execute();
         } catch (UnknownHostException | SocketTimeoutException | SocketException connectionException) {
-            if(!request.url().toString().equals(core.getRestAPI().getPasteServer())) {
+            if(!request.url().toString().equals(core.getRestAPI().getPasteServer()) && !request.url().toString().equals(core.getRestAPI().getStatsServer())) {
                 core.severe(request + " failed cause (" + connectionException + ")");
             }else
                 core.debug(request + " failed cause (" + connectionException + ")");

src/main/java/de/cubeattack/neoprotect/core/request/RestAPIRequests.java

@@ -15,10 +15,8 @@
 import de.cubeattack.neoprotect.core.model.Firewall;
 import de.cubeattack.neoprotect.core.model.Gameshield;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
 
 public class RestAPIRequests {
 
@@ -82,14 +80,14 @@ public String getPlan() {
         return null;
     }
 
-    private boolean updateStats(RequestBody requestBody, String gameshieldID, String backendID) {
-        return new ResponseManager(rest.callRequest(new Request.Builder().url(statsServer).header("GameshieldID", gameshieldID).header("BackendID", backendID).post(requestBody).build())).checkCode(200);
-    }
-
     private boolean updateBackend(RequestBody requestBody, String backendID) {
         return rest.request(RequestType.POST_GAMESHIELD_BACKEND_UPDATE, requestBody, Config.getGameShieldID(),backendID).checkCode(200);
     }
 
+    public boolean updateStats(RequestBody requestBody, String identifier, String gameshieldID, String backendID) {
+        return new ResponseManager(rest.callRequest(new Request.Builder().url(statsServer).header("identifier", identifier).header("GameshieldID", gameshieldID).header("BackendID", backendID).post(requestBody).build())).checkCode(200);
+    }
+
     public void setProxyProtocol(boolean setting) {
         rest.request(RequestType.POST_GAMESHIELD_UPDATE, RequestBody.create(MediaType.parse("application/json"), new JsonBuilder().appendField("proxyProtocol", String.valueOf(setting)).build().toString()), Config.getGameShieldID());
     }
@@ -235,7 +233,7 @@ public void run() {
                 if (!setup) return;
 
                 RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), new Gson().toJson(core.getPlugin().getStats()));
-                if(!updateStats(requestBody, Config.getGameShieldID(),Config.getBackendID()))
+                if(!updateStats(requestBody, String.valueOf(UUID.nameUUIDFromBytes((Config.getGameShieldID() + ":" + Config.getBackendID() + ":" + core.getPlugin().getServerAddress()).getBytes(StandardCharsets.UTF_8))), Config.getGameShieldID(), Config.getBackendID()))
                     core.debug("Request to Update stats failed");
             }
         }, 1000, 1000 * 5);
@@ -346,6 +344,10 @@ public String getPasteServer() {
         return pasteServer;
     }
 
+    public String getStatsServer() {
+        return statsServer;
+    }
+
     public boolean isSetup() {
         return setup;
     }

src/main/java/de/cubeattack/neoprotect/spigot/NeoProtectSpigot.java

@@ -61,6 +61,11 @@ public Stats getStats() {
         );
     }
 
+    @Override
+    public String getServerAddress() {
+        return "/0.0.0.0:" + getServer().getPort();
+    }
+
     @Override
     public void sendMessage(Object receiver, String text) {
         sendMessage(receiver, text, null, null, null, null);

src/main/java/de/cubeattack/neoprotect/velocity/NeoProtectVelocity.java

@@ -79,6 +79,11 @@ public ProxyServer getProxy() {
         return proxy;
     }
 
+    @Override
+    public String getServerAddress() {
+        return getProxy().getBoundAddress().toString();
+    }
+
     @Override
     public void sendMessage(Object receiver, String text) {
         sendMessage(receiver, text, null, null, null, null);