Fixed dirty flags for CustomDomain, added UnitTest

Author: Joo200

worldguard-core/src/main/java/com/sk89q/worldguard/commands/CommandInputContext.java

@@ -19,10 +19,8 @@
 
 package com.sk89q.worldguard.commands;
 
-import com.google.common.collect.Maps;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldguard.LocalPlayer;
-import com.sk89q.worldguard.protection.flags.FlagContext;
 import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 
 import javax.annotation.Nullable;

worldguard-core/src/main/java/com/sk89q/worldguard/domains/CustomDomain.java

@@ -32,6 +32,7 @@ public abstract class CustomDomain implements Domain, ChangeTracked {
     private static final Pattern VALID_NAME = Pattern.compile("^[A-Za-z0-9\\-]{1,40}$");
 
     private final String name;
+    private boolean dirty;
 
     public CustomDomain(String name) {
         if (name == null ||!isValidName(name)) {
@@ -93,4 +94,14 @@ public boolean contains(LocalPlayer player) {
     public int size() {
         return 1;
     }
+
+    @Override
+    public boolean isDirty() {
+        return dirty;
+    }
+
+    @Override
+    public void setDirty(boolean dirty) {
+        this.dirty = dirty;
+    }
 }

worldguard-core/src/main/java/com/sk89q/worldguard/domains/DefaultDomain.java

@@ -54,6 +54,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
     private GroupDomain groupDomain = new GroupDomain();
 
     private Set<CustomDomain> customDomains = new HashSet<>();
+    private boolean customDomainsChanged = false;
 
     /**
      * Create a new domain.
@@ -119,6 +120,7 @@ public void addCustomDomain(CustomDomain customDomain) {
         checkNotNull(customDomain);
         removeCustomDomain(customDomain.getName());
         this.customDomains.add(customDomain);
+        customDomainsChanged = true;
     }
 
     /**
@@ -128,7 +130,9 @@ public void addCustomDomain(CustomDomain customDomain) {
      */
     public void removeCustomDomain(String name) {
         checkNotNull(name);
-        this.customDomains.removeIf(d -> d.getName().equalsIgnoreCase(name));
+        if (this.customDomains.removeIf(d -> d.getName().equalsIgnoreCase(name))) {
+            customDomainsChanged = true;
+        }
     }
 
     /**
@@ -138,7 +142,9 @@ public void removeCustomDomain(String name) {
      */
     public void removeCustomDomain(CustomDomain customDomain) {
         checkNotNull(customDomain);
-        this.customDomains.remove(customDomain);
+        if (this.customDomains.remove(customDomain)) {
+            customDomainsChanged = true;
+        }
     }
 
     /**
@@ -149,6 +155,7 @@ public void removeCustomDomain(CustomDomain customDomain) {
     public void setCustomDomains(Collection<CustomDomain> customDomains) {
         checkNotNull(customDomains);
         this.customDomains = new HashSet<>(customDomains);
+        customDomainsChanged = true;
     }
 
     /**
@@ -534,13 +541,15 @@ private Component toCustomDomainsComponent() {
 
     @Override
     public boolean isDirty() {
-        return playerDomain.isDirty() || groupDomain.isDirty() || customDomains.stream().anyMatch(ChangeTracked::isDirty);
+        return playerDomain.isDirty() || groupDomain.isDirty() ||
+                customDomainsChanged ||  customDomains.stream().anyMatch(ChangeTracked::isDirty);
     }
 
     @Override
     public void setDirty(boolean dirty) {
         playerDomain.setDirty(dirty);
         groupDomain.setDirty(dirty);
+        customDomainsChanged = true;
         customDomains.forEach(d -> d.setDirty(dirty));
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/domains/registry/UnknownDomain.java

@@ -34,7 +34,7 @@ public UnknownDomain(String name) {
     }
 
     @Override
-    public void parseInput(CustomDomainContext c) throws InvalidDomainFormat {
+    public void parseInput(CustomDomainContext context) throws InvalidDomainFormat {
         throw new InvalidDomainFormat("The plugin that registered this flag is not currently installed");
     }
 

worldguard-core/src/test/java/com/sk89q/worldguard/domains/CustomUUIDDomain.java

@@ -0,0 +1,64 @@
+/*
+ * WorldGuard, a suite of tools for Minecraft
+ * Copyright (C) sk89q <http://www.sk89q.com>
+ * Copyright (C) WorldGuard team and contributors
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.sk89q.worldguard.domains;
+
+import com.sk89q.worldguard.domains.registry.CustomDomainContext;
+import com.sk89q.worldguard.domains.registry.InvalidDomainFormat;
+
+import java.util.Objects;
+import java.util.UUID;
+
+public class CustomUUIDDomain extends CustomDomain {
+    private UUID test;
+
+    public CustomUUIDDomain(String name, UUID test) {
+        super(name);
+        this.test = test;
+    }
+
+    @Override
+    public void parseInput(CustomDomainContext context) throws InvalidDomainFormat {
+        throw new InvalidDomainFormat("not supported");
+    }
+
+    @Override
+    public void unmarshal(Object o) {
+    }
+
+    @Override
+    public Object marshal() {
+        return null;
+    }
+
+    @Override
+    public boolean contains(UUID uniqueId) {
+        return Objects.equals(test, uniqueId);
+    }
+
+    @Override
+    public boolean contains(String playerName) {
+        return false;
+    }
+
+    @Override
+    public void clear() {
+        test = null;
+    }
+}

worldguard-core/src/test/java/com/sk89q/worldguard/domains/DefaultDomainTest.java

@@ -112,5 +112,11 @@ public void testContains() throws Exception {
         assertFalse(domain.contains(player1));
         assertTrue(domain.contains(player2));
         assertTrue(domain.contains(player3));
+
+        domain = new DefaultDomain();
+        domain.addCustomDomain(new CustomUUIDDomain("test", player2.getUniqueId()));
+        assertTrue(domain.contains(player2));
+        assertFalse(domain.contains(player2.getName()));
+        assertFalse(domain.contains(player3));
     }
 }