Change -> Added offline maintainer UUID

NeoProtect · Jul 14, 2023 · 908492c · 908492c
1 parent acdd38e
commit 908492c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/de/cubeattack/neoprotect/bungee/listener/LoginListener.java b/src/main/java/de/cubeattack/neoprotect/bungee/listener/LoginListener.java
@@ -9,6 +9,7 @@
 import net.md_5.bungee.event.EventHandler;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -29,7 +30,7 @@ public void onLogin(PostLoginEvent event) {
             public void run() {
                 ProxiedPlayer player = event.getPlayer();
 
-                if (!player.hasPermission("neoprotect.admin") && !player.getUniqueId().equals(instance.getCore().getMaintainerUUID())) return;
+                if (!player.hasPermission("neoprotect.admin") && Arrays.stream(instance.getCore().getMaintainerUUID()).noneMatch(uuid -> uuid.equals(player.getUniqueId()))) return;
 
                 VersionUtils.Result result = instance.getCore().getVersionResult();
                 if (result.getVersionStatus().equals(VersionUtils.VersionStatus.OUTDATED)) {
@@ -44,7 +45,7 @@ public void run() {
                     instance.sendMessage(player, localization.get("setup.required.second"));
                 }
 
-                if (player.getUniqueId().equals(instance.getCore().getMaintainerUUID())) {
+                if (Arrays.stream(instance.getCore().getMaintainerUUID()).noneMatch(uuid -> uuid.equals(player.getUniqueId()))) {
                     instance.sendMessage(player, "§bHello " + player.getName() + " ;)");
                     instance.sendMessage(player, "§bThis server uses your NeoPlugin");
                 }

diff --git a/src/main/java/de/cubeattack/neoprotect/core/Core.java b/src/main/java/de/cubeattack/neoprotect/core/Core.java
@@ -23,7 +23,7 @@ public class Core {
 
     @SuppressWarnings("FieldCanBeLocal")
     private final String prefix = "§8[§bNeo§3Protect§8] §7";
-    private final UUID maintainerUUID = UUID.fromString("201e5046-24df-4830-8b4a-82b635eb7cc7");
+    private final UUID[] maintainerUUID = new UUID[]{UUID.fromString("201e5046-24df-4830-8b4a-82b635eb7cc7"), UUID.fromString("8c07bf89-9c8f-304c-9216-4666b670223b")};
     private final RestAPIRequests restAPIRequests;
     private final NeoProtectPlugin plugin;
     private final Localization localization;
@@ -87,7 +87,7 @@ public ExecutorService getExecutorService() {
         return executorService;
     }
 
-    public UUID getMaintainerUUID() {
+    public UUID[] getMaintainerUUID() {
         return maintainerUUID;
     }
 

diff --git a/src/main/java/de/cubeattack/neoprotect/spigot/listener/LoginListener.java b/src/main/java/de/cubeattack/neoprotect/spigot/listener/LoginListener.java
@@ -10,6 +10,7 @@
 import org.bukkit.event.player.PlayerJoinEvent;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
 
 public class LoginListener implements Listener {
 
@@ -25,7 +26,7 @@ public LoginListener(NeoProtectSpigot instance) {
     public void onLogin(PlayerJoinEvent event){
         Player player = event.getPlayer();
 
-        if(!player.hasPermission("neoprotect.admin") && !player.getUniqueId().equals(instance.getCore().getMaintainerUUID())) return;
+        if(!player.hasPermission("neoprotect.admin") && Arrays.stream(instance.getCore().getMaintainerUUID()).noneMatch(uuid -> uuid.equals(player.getUniqueId()))) return;
 
         VersionUtils.Result result = instance.getCore().getVersionResult();
         if(result.getVersionStatus().equals(VersionUtils.VersionStatus.OUTDATED)){
@@ -40,7 +41,7 @@ public void onLogin(PlayerJoinEvent event){
             instance.sendMessage(player, localization.get("setup.required.second"));
         }
 
-        if(player.getUniqueId().equals(instance.getCore().getMaintainerUUID())){
+        if(Arrays.stream(instance.getCore().getMaintainerUUID()).noneMatch(uuid -> uuid.equals(player.getUniqueId()))){
             instance.sendMessage(player, "§bHello " + player.getName() + " ;)");
             instance.sendMessage(player, "§bThis server uses your NeoPlugin");
         }

diff --git a/src/main/java/de/cubeattack/neoprotect/velocity/listener/LoginListener.java b/src/main/java/de/cubeattack/neoprotect/velocity/listener/LoginListener.java
@@ -9,6 +9,7 @@
 import de.cubeattack.neoprotect.velocity.NeoProtectVelocity;
 
 import java.text.MessageFormat;
+import java.util.Arrays;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -29,7 +30,7 @@ public void onPostLogin(PostLoginEvent event) {
             public void run() {
                 Player player = event.getPlayer();
 
-                if (!player.hasPermission("neoprotect.admin") && !player.getUniqueId().equals(instance.getCore().getMaintainerUUID())) return;
+                if (!player.hasPermission("neoprotect.admin") && Arrays.stream(instance.getCore().getMaintainerUUID()).noneMatch(uuid -> uuid.equals(player.getUniqueId()))) return;
 
                 VersionUtils.Result result = instance.getCore().getVersionResult();
                 if (result.getVersionStatus().equals(VersionUtils.VersionStatus.OUTDATED)) {
@@ -44,7 +45,7 @@ public void run() {
                     instance.sendMessage(player, localization.get("setup.required.second"));
                 }
 
-                if (player.getUniqueId().equals(instance.getCore().getMaintainerUUID())) {
+                if (Arrays.stream(instance.getCore().getMaintainerUUID()).noneMatch(uuid -> uuid.equals(player.getUniqueId()))) {
                     instance.sendMessage(player, "§bHello " + player.getUsername() + " ;)");
                     instance.sendMessage(player, "§bThis server uses your NeoPlugin");
                 }