Release 7.0.19

* Cancel blocked natural spawns before the entity is created

The mob-spawning and deny-spawn checks in WorldGuardEntityListener fire
on CreatureSpawnEvent, at the very end of the spawn pipeline. By that
point the server has picked a spawn position, run the placement checks,
constructed the mob and run finalizeSpawn, and the cancelled mob is
thrown away. Since a cancelled spawn never counts toward the mob cap,
the natural spawner keeps retrying the same area at full rate, so
regions that deny mob spawning become permanent spawn attempt hotspots
that pay entity construction over and over for nothing.

On Paper servers the same checks can run in PreCreatureSpawnEvent,
before the entity exists. Cancelling there also ends the remaining
attempts for the chunk in that spawn cycle, so the wasted work is gone
almost entirely. Measured on a flat test world with a region denying
mob-spawning over the whole spawn range and the mob cap kept empty, the
attempt rate around a single player collapsed from roughly 75000
attempts per second to roughly 60 per second, with no entities
constructed at all.

The new listener mirrors the natural spawn conditions from
onCreatureSpawn exactly: activity halt, block-creature-spawn,
mob-spawning and deny-spawn region flags, and block-ground-slimes. All
other spawn reasons keep going through the existing CreatureSpawnEvent
checks unchanged, and the listener is only registered when the Paper
event class is present.

* Move the pre spawn handler into the existing Paper inner listener

Review feedback: platform specific code lives in the Paper inner
classes of the main listeners, and WorldGuardEntityListener already has
one for EntityZapEvent, so the handler moves in there and the separate
listener class is gone.

* Match the HIGH priority of the other protection handlers

* Extract the shared spawn checks into a method used by both handlers

The pre spawn handler duplicated the tail of onCreatureSpawn. Both now
call handleCreatureSpawn, which takes the event as a Cancellable and
the location, entity type and spawn reason as parameters, following
the same shape as handlePigZap. The entity specific checks (plugin
spawning, armor stands, tamed animals) stay in onCreatureSpawn since
no entity exists yet at pre spawn time, and the activity halt check
stays in each handler so its ordering relative to those checks is
unchanged.

* Pass cfg and wcfg into the shared spawn checks

Both handlers already have them, so the shared method no longer does a
second lookup.

* Correct the rationale on the pre spawn handler

The comment claimed that cancelling ends the chunk's remaining spawn
attempts. It does not. Only setShouldAbortSpawn(true) makes the spawner
return early; a plain cancel falls through to the next candidate position
exactly like a failed placement check.

What the handler does buy is stated accurately instead: the placement
checks, the entity construction and finalizeSpawn are skipped for a spawn
that was going to be refused.

Two consequences a server operator should know are now named. The region
query runs for every candidate position rather than every constructed mob,
because Paper fires the event before the vanilla suitability checks. And on
Paper with per-player-mob-spawns enabled, every cancelled pre spawn is
charged to a per player mob backoff counter, so a large denied region can
suppress spawning in neighbouring chunks that allow mobs.

* Add a config option for the pre spawn handler

regions.use-pre-creature-spawn-event, default true, matching how
regions.use-creature-spawn-event already gates the CreatureSpawnEvent
path. Turning it off leaves the existing handler doing all the work, so
a server that sees a regression can revert without downgrading.

.gitattributes

@@ -1,34 +1,2 @@
-* text=auto eol=lf
-# Force Batch files to CRLF
-*.bat eol=crlf -text
+*.java   diff=java
 
-# Java sources
-*.java          text diff=java
-*.kt            text diff=java
-*.gradle        text diff=java
-*.gradle.kts    text diff=java
-
-# These files are text and should be normalized (Convert crlf => lf)
-*.css           text diff=css
-*.df            text
-*.htm           text diff=html
-*.html          text diff=html
-*.js            text
-*.jsp           text
-*.jspf          text
-*.jspx          text
-*.properties    text
-*.tld           text
-*.tag           text
-*.tagx          text
-*.xml           text
-
-# These files are binary and should be left untouched
-# (binary is a macro for -text -diff)
-*.class         binary
-*.dll           binary
-*.ear           binary
-*.jar           binary
-*.so            binary
-*.war           binary
-*.jks           binary

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 7.0.19
+
+* Require 26.2+.
+* Improved handling for TNT inside of sulfur cubes.
+* Improve performance of mob spawn prevention on Paper servers in some situations.
+* Improved handling of certain flags when `/wg flushstates` is run, or in certain login situations.
+
 ## 7.0.18
 
 * Add lava-harden flag for cobblestone/stone/obsidian/basalt forming.

buildSrc/src/main/kotlin/CommonJavaConfig.kt

@@ -1,86 +0,0 @@
-import org.gradle.api.Project
-import org.gradle.api.plugins.JavaPluginExtension
-import org.gradle.api.plugins.quality.CheckstyleExtension
-import org.gradle.api.tasks.compile.JavaCompile
-import org.gradle.api.tasks.javadoc.Javadoc
-import org.gradle.api.tasks.testing.Test
-import org.gradle.external.javadoc.StandardJavadocDocletOptions
-import org.gradle.kotlin.dsl.apply
-import org.gradle.kotlin.dsl.configure
-import org.gradle.kotlin.dsl.dependencies
-import org.gradle.kotlin.dsl.get
-import org.gradle.kotlin.dsl.withType
-
-fun Project.applyCommonJavaConfiguration(sourcesJar: Boolean, javaRelease: Int = 8, banSlf4j: Boolean = true) {
-    applyCommonConfiguration()
-    apply(plugin = "eclipse")
-    apply(plugin = "idea")
-    apply(plugin = "checkstyle")
-
-    tasks
-        .withType<JavaCompile>()
-        .matching { it.name == "compileJava" || it.name == "compileTestJava" }
-        .configureEach {
-            val disabledLint = listOf(
-                "processing", "path", "fallthrough", "serial"
-            )
-            options.release.set(javaRelease)
-            options.compilerArgs.addAll(listOf("-Xlint:all") + disabledLint.map { "-Xlint:-$it" })
-            options.isDeprecation = true
-            options.encoding = "UTF-8"
-            options.compilerArgs.add("-parameters")
-        }
-
-    configure<CheckstyleExtension> {
-        configFile = rootProject.file("config/checkstyle/checkstyle.xml")
-        toolVersion = "9.1"
-    }
-
-    tasks.withType<Test>().configureEach {
-        useJUnitPlatform()
-    }
-
-    dependencies {
-        "compileOnly"("com.google.code.findbugs:jsr305:${Versions.FINDBUGS}")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-api:${Versions.JUNIT}")
-        "testImplementation"("org.junit.jupiter:junit-jupiter-params:${Versions.JUNIT}")
-        "testImplementation"("org.mockito:mockito-core:${Versions.MOCKITO}")
-        "testImplementation"("org.mockito:mockito-junit-jupiter:${Versions.MOCKITO}")
-        "testRuntimeOnly"("org.junit.jupiter:junit-jupiter-engine:${Versions.JUNIT}")
-    }
-
-    // Java 8 turns on doclint which we fail
-    tasks.withType<Javadoc>().configureEach {
-        options.encoding = "UTF-8"
-        (options as StandardJavadocDocletOptions).apply {
-            addStringOption("Xdoclint:none", "-quiet")
-            tags(
-                "apiNote:a:API Note:",
-                "implSpec:a:Implementation Requirements:",
-                "implNote:a:Implementation Note:"
-            )
-        }
-    }
-
-    configure<JavaPluginExtension> {
-        disableAutoTargetJvm()
-        withJavadocJar()
-        if (sourcesJar) {
-            withSourcesJar()
-        }
-    }
-
-    if (banSlf4j) {
-        configurations["compileClasspath"].apply {
-            resolutionStrategy.componentSelection {
-                withModule("org.slf4j:slf4j-api") {
-                    reject("No SLF4J allowed on compile classpath")
-                }
-            }
-        }
-    }
-
-    tasks.named("check").configure {
-        dependsOn("checkstyleMain", "checkstyleTest")
-    }
-}

gradle.properties

@@ -1,4 +1,4 @@
 group=com.sk89q.worldguard
-version=7.1.0-SNAPSHOT
+version=7.0.19
 
 org.gradle.parallel=true

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/WorldGuardPlugin.java

@@ -67,7 +67,6 @@ import com.sk89q.worldguard.bukkit.util.Events;
 import com.sk89q.worldguard.commands.GeneralCommands;
 import com.sk89q.worldguard.commands.ProtectionCommands;
 import com.sk89q.worldguard.commands.ToggleCommands;
-import com.sk89q.worldguard.domains.registry.SimpleDomainRegistry;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.registry.SimpleFlagRegistry;
@@ -241,7 +240,6 @@ public class WorldGuardPlugin extends JavaPlugin {
         }
 
         ((SimpleFlagRegistry) WorldGuard.getInstance().getFlagRegistry()).setInitialized(true);
-        ((SimpleDomainRegistry) WorldGuard.getInstance().getDomainRegistry()).setInitialized(true);
 
         // Enable metrics
         final Metrics metrics = new Metrics(this, BSTATS_PLUGIN_ID); // bStats plugin id

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/cause/Cause.java

@@ -40,6 +40,7 @@ import org.bukkit.entity.Firework;
 import org.bukkit.entity.LightningStrike;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
+import org.bukkit.entity.SulfurCube;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Vehicle;
@@ -117,7 +118,7 @@ public final class Cause {
             return false;
         }
 
-        if (object instanceof TNTPrimed || object instanceof Vehicle) {
+        if (object instanceof TNTPrimed || object instanceof Vehicle || object instanceof SulfurCube) {
             if (!PaperLib.isPaper()) {
                 return false;
             }

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java

@@ -83,6 +83,7 @@ import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Mob;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.SulfurCube;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.ThrownPotion;
 import org.bukkit.entity.WindCharge;
@@ -895,7 +896,18 @@ public class EventAbstractionListener extends AbstractListener {
         if (matchingItem != null && hasInteractBypass(world, matchingItem)) {
             useEntityEvent.setAllowed(true);
         }
-        Events.fireToCancel(event, useEntityEvent);
+        if (!Events.fireToCancel(event, useEntityEvent)) {
+            /* Sulfur cube doesn't have API for interaction/ignition source tracking */
+            if(entity instanceof SulfurCube) {
+                /* Remove player in case of using shears */
+                if(item.getType() == Material.SHEARS) {
+                    Cause.untrackParentCause(entity);
+                /* Save player overwise */
+                } else {
+                    Cause.trackParentCause(entity, player);
+                }
+            }
+        }
     }
 
     @EventHandler(ignoreCancelled = true)
@@ -917,6 +929,8 @@ public class EventAbstractionListener extends AbstractListener {
                 eventToFire.getRelevantFlags().add(Flags.FIREWORK_DAMAGE);
             } else if (damager instanceof Creeper) {
                 eventToFire.getRelevantFlags().add(Flags.CREEPER_EXPLOSION);
+            } else if (damager instanceof SulfurCube) {
+                eventToFire.getRelevantFlags().add(Flags.TNT);
             }
             if (Events.fireToCancel(event, eventToFire)) {
                 if (damager instanceof Tameable && damager instanceof Mob) {

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java

@@ -57,6 +57,7 @@ import org.bukkit.entity.ExperienceOrb;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.SulfurCube;
 import org.bukkit.entity.Tameable;
 import org.bukkit.event.Event;
 import org.bukkit.event.Event.Result;
@@ -222,7 +223,7 @@ public class RegionProtectionListener extends AbstractListener {
                 String what;
 
                 /* TNT */
-                if (event.getCause().find(EntityType.TNT, EntityType.TNT_MINECART) != null) {
+                if (event.getCause().find(EntityType.TNT, EntityType.TNT_MINECART, EntityType.SULFUR_CUBE) != null) {
                     canBreak = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.BLOCK_BREAK, Flags.TNT));
                     what = "use dynamite";
 

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/WorldGuardEntityListener.java

@@ -20,6 +20,7 @@
 package com.sk89q.worldguard.bukkit.listener;
 
 import com.destroystokyo.paper.event.entity.EntityZapEvent;
+import com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldguard.LocalPlayer;
@@ -61,6 +62,7 @@ import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
+import org.bukkit.entity.SulfurCube;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.WindCharge;
@@ -487,7 +489,7 @@ public class WorldGuardEntityListener extends AbstractListener {
                 event.blockList().clear();
                 return;
             }
-        } else if (ent instanceof TNTPrimed || ent instanceof ExplosiveMinecart) {
+        } else if (ent instanceof TNTPrimed || ent instanceof ExplosiveMinecart || ent instanceof SulfurCube) {
             if (wcfg.blockTNTExplosions) {
                 event.setCancelled(true);
                 return;
@@ -615,7 +617,8 @@ public class WorldGuardEntityListener extends AbstractListener {
                 return;
             }
         } else if (event.getEntityType() == EntityType.TNT
-                || event.getEntityType() == EntityType.TNT_MINECART) {
+                || event.getEntityType() == EntityType.TNT_MINECART
+                || event.getEntityType() == EntityType.SULFUR_CUBE) {
             if (wcfg.blockTNTExplosions) {
                 event.setCancelled(true);
                 return;
@@ -655,8 +658,11 @@ public class WorldGuardEntityListener extends AbstractListener {
             return;
         }
 
-        EntityType entityType = event.getEntityType();
+        handleCreatureSpawn(event, event.getLocation(), event.getEntityType(), event.getSpawnReason(), cfg, wcfg);
+    }
 
+    private static void handleCreatureSpawn(Cancellable event, Location location, EntityType entityType, SpawnReason spawnReason,
+                                            ConfigurationManager cfg, WorldConfiguration wcfg) {
         com.sk89q.worldedit.world.entity.EntityType weEntityType = BukkitAdapter.adapt(entityType);
 
         if (weEntityType != null && wcfg.blockCreatureSpawn.contains(weEntityType)) {
@@ -664,11 +670,9 @@ public class WorldGuardEntityListener extends AbstractListener {
             return;
         }
 
-        Location eventLoc = event.getLocation();
-
         if (wcfg.useRegions && cfg.useRegionsCreatureSpawnEvent) {
             ApplicableRegionSet set =
-                    WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().getApplicableRegions(BukkitAdapter.adapt(eventLoc));
+                    WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().getApplicableRegions(BukkitAdapter.adapt(location));
 
             if (!set.testState(null, Flags.MOB_SPAWNING)) {
                 event.setCancelled(true);
@@ -683,8 +687,8 @@ public class WorldGuardEntityListener extends AbstractListener {
         }
 
         if (wcfg.blockGroundSlimes && entityType == EntityType.SLIME
-                && eventLoc.getY() >= 60
-                && event.getSpawnReason() == SpawnReason.NATURAL) {
+                && location.getY() >= 60
+                && spawnReason == SpawnReason.NATURAL) {
             event.setCancelled(true);
             return;
         }
@@ -905,6 +909,53 @@ public class WorldGuardEntityListener extends AbstractListener {
                 handlePigZap(event.getEntity(), event);
             }
         }
+
+        /**
+         * Applies the natural spawn checks from {@link WorldGuardEntityListener#onCreatureSpawn} before the
+         * server constructs the entity. The CreatureSpawnEvent checks fire at the very
+         * end of the spawn pipeline, after the position was picked, the placement
+         * checks ran and the mob was constructed and finalized, so a region that denies
+         * mob spawning pays for a mob to be built and thrown away on every attempt.
+         * Cancelling here skips the placement checks, the construction and
+         * finalizeSpawn for a spawn that was going to be refused anyway.
+         *
+         * Cancelling does not end the chunk's remaining attempts. Only
+         * setShouldAbortSpawn(true) makes the spawner return early; a plain cancel
+         * falls through to the next candidate position exactly like a failed
+         * placement check.
+         *
+         * Note that Paper fires this event for every candidate position, before the
+         * light, block and collision checks, so the region query below runs
+         * considerably more often than the CreatureSpawnEvent one did. On Paper with
+         * per-player-mob-spawns enabled, which is the default, every cancelled pre
+         * spawn is also charged to a per player mob backoff counter that is added to
+         * the mob cap of every player within tick view distance and bleeds off one per
+         * spawn cycle, so a large denied region can suppress spawning in neighbouring
+         * chunks that allow mobs.
+         *
+         * Only NATURAL spawns are handled here; every other spawn reason keeps going
+         * through the CreatureSpawnEvent checks unchanged.
+         */
+        @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
+        public void onPreCreatureSpawn(PreCreatureSpawnEvent event) {
+            if (event.getReason() != SpawnReason.NATURAL) {
+                return;
+            }
+
+            ConfigurationManager cfg = getConfig();
+
+            if (!cfg.useRegionsPreCreatureSpawnEvent) {
+                return;
+            }
+
+            if (cfg.activityHaltToggle) {
+                event.setCancelled(true);
+                return;
+            }
+
+            Location spawnLoc = event.getSpawnLocation();
+            handleCreatureSpawn(event, spawnLoc, event.getType(), event.getReason(), cfg, getWorldConfig(spawnLoc.getWorld()));
+        }
     }
 
     private static class SpigotListener implements Listener {

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/session/BukkitSessionManager.java

@@ -43,8 +43,8 @@ import java.util.function.Consumer;
 public class BukkitSessionManager extends AbstractSessionManager implements Runnable, Listener {
 
     /**
-     * Re-initialize handlers and clear "last position," "last state," etc.
-     * information for all players.
+     * Restore handler-managed state, re-initialize handlers, and clear
+     * "last position," "last state," etc. information for all players.
      */
     @Override
     @SuppressWarnings({"rawtypes", "unchecked"})
@@ -72,9 +72,14 @@ public class BukkitSessionManager extends AbstractSessionManager implements Runn
 
     @EventHandler
     public void onPlayerProcess(ProcessPlayerEvent event) {
-        // Pre-load a session
+        // Create a new session or re-initialize a cached one.
         LocalPlayer player = WorldGuardPlugin.inst().wrapPlayer(event.getPlayer());
-        get(player).initialize(player);
+        Session session = getIfPresent(player);
+        if (session == null) {
+            get(player); // this also initializes the new session
+        } else {
+            session.resetState(player); // old sessions need explicit re-initialization 
+        }
     }
 
     @Override

worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Entities.java

@@ -43,6 +43,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.entity.Projectile;
 import org.bukkit.entity.SpectralArrow;
 import org.bukkit.entity.Steerable;
+import org.bukkit.entity.SulfurCube;
 import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Vehicle;
@@ -78,7 +79,9 @@ public final class Entities {
      * @return true if TNT based
      */
     public static boolean isTNTBased(Entity entity) {
-        return entity instanceof TNTPrimed || entity instanceof ExplosiveMinecart;
+        return entity instanceof TNTPrimed
+                || entity instanceof ExplosiveMinecart
+                || entity instanceof SulfurCube sulfurCube && sulfurCube.canExplode();
     }
 
     /**
@@ -265,6 +268,7 @@ public final class Entities {
             case Wither wither -> Flags.WITHER_DAMAGE;
             case Creeper creeper -> Flags.CREEPER_EXPLOSION;
             case TNTPrimed tnt -> Flags.TNT;
+            case SulfurCube sulfurCube -> Flags.TNT;
             case ExplosiveMinecart minecart -> Flags.TNT;
             case EnderDragon dragon -> Flags.ENDERDRAGON_BLOCK_DAMAGE;
             case null, default -> Flags.OTHER_EXPLOSION;

worldguard-core/src/main/java/com/sk89q/worldguard/WorldGuard.java

@@ -24,8 +24,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.sk89q.minecraft.util.commands.CommandException;
-import com.sk89q.worldguard.domains.registry.DomainRegistry;
-import com.sk89q.worldguard.domains.registry.SimpleDomainRegistry;
 import com.sk89q.worldguard.util.profile.cache.HashMapCache;
 import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 import com.sk89q.worldguard.util.profile.cache.SQLiteCache;
@@ -57,7 +55,6 @@ public final class WorldGuard {
 
     private WorldGuardPlatform platform;
     private final SimpleFlagRegistry flagRegistry = new SimpleFlagRegistry();
-    private final SimpleDomainRegistry domainRegistry = new SimpleDomainRegistry();
     private final Supervisor supervisor = new SimpleSupervisor();
     private ProfileCache profileCache;
     private ProfileService profileService;
@@ -119,16 +116,6 @@ public final class WorldGuard {
         return this.flagRegistry;
     }
 
-
-    /**
-     * Get the domain registry.
-     *
-     * @return the domain registry
-     */
-    public DomainRegistry getDomainRegistry() {
-        return this.domainRegistry;
-    }
-
     /**
      * Get the supervisor.
      *

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

@@ -1,111 +0,0 @@
-/*
- * 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.commands;
-
-import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldguard.LocalPlayer;
-
-import javax.annotation.Nullable;
-import java.util.Map;
-
-public abstract class CommandInputContext<T extends Exception> {
-    protected final Actor sender;
-    protected final String input;
-
-    protected Map<String, Object> context;
-
-    protected CommandInputContext(Actor sender, String input, Map<String, Object> values) {
-        this.sender = sender;
-        this.input = input;
-        this.context = values;
-    }
-
-    public void put(String name, Object value) {
-        context.put(name, value);
-    }
-
-    public Actor getSender() {
-        return sender;
-    }
-
-    public String getUserInput() {
-        return input;
-    }
-
-    /**
-     * Gets the CommandSender as a player.
-     *
-     * @return Player
-     * @throws T if the sender is not a player
-     */
-    public LocalPlayer getPlayerSender() throws T {
-        if (sender.isPlayer() && sender instanceof LocalPlayer) {
-            return (LocalPlayer) sender;
-        } else {
-            throw createException("Not a player");
-        }
-    }
-
-    public Integer getUserInputAsInt() throws T {
-        try {
-            return Integer.parseInt(input);
-        } catch (NumberFormatException e) {
-            throw createException("Not a number: " + input);
-        }
-    }
-
-    public Double getUserInputAsDouble() throws T {
-        try {
-            return Double.parseDouble(input);
-        } catch (NumberFormatException e) {
-            throw createException("Not a number: " + input);
-        }
-    }
-
-    protected abstract T createException(String str);
-
-    /**
-     * Get an object from the context by key name.
-     * May return null if the object does not exist in the context.
-     *
-     * @param name key name of the object
-     * @return the object matching the key, or null
-     */
-    @Nullable
-    public Object get(String name) {
-        return get(name, null);
-    }
-
-    /**
-     * Get an object from the context by key name.
-     * Will only return null if
-     *  a) you provide null as the default
-     *  b) the key has explicity been set to null
-     *
-     * @param name key name of the object
-     * @return the object matching the key
-     */
-    @Nullable
-    public Object get(String name, Object defaultValue) {
-        Object obj;
-        return (((obj = context.get(name)) != null) || context.containsKey(name)
-                ? obj : defaultValue);
-    }
-}

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/MemberCommands.java

@@ -25,27 +25,16 @@ import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissionsException;
 import com.sk89q.worldedit.command.util.AsyncCommandBuilder;
 import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldedit.util.formatting.component.ErrorFormat;
-import com.sk89q.worldedit.util.formatting.text.Component;
-import com.sk89q.worldedit.util.formatting.text.TextComponent;
-import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
-import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
-import com.sk89q.worldedit.util.formatting.text.format.TextColor;
+import com.sk89q.worldedit.util.auth.AuthorizationException;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.domains.DefaultDomain;
-import com.sk89q.worldguard.domains.registry.DomainFactory;
-import com.sk89q.worldguard.domains.registry.DomainRegistry;
-import com.sk89q.worldguard.internal.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.protection.util.DomainInputResolver;
 import com.sk89q.worldguard.protection.util.DomainInputResolver.UserLocatorPolicy;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Map;
 import java.util.concurrent.Callable;
 
 public class MemberCommands extends RegionCommandsBase {
@@ -78,8 +67,6 @@ public class MemberCommands extends RegionCommandsBase {
         DomainInputResolver resolver = new DomainInputResolver(
                 WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
         resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_ONLY);
-        resolver.setActor(sender);
-        resolver.setRegion(region);
 
 
         final String description = String.format("Adding members to the region '%s' on '%s'", region.getId(), world.getName());
@@ -114,8 +101,7 @@ public class MemberCommands extends RegionCommandsBase {
         DomainInputResolver resolver = new DomainInputResolver(
                 WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
         resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_ONLY);
-        resolver.setActor(sender);
-        resolver.setRegion(region);
+
 
         final String description = String.format("Adding owners to the region '%s' on '%s'", region.getId(), world.getName());
         AsyncCommandBuilder.wrap(checkedAddOwners(sender, manager, region, world, resolver), sender)
@@ -188,8 +174,6 @@ public class MemberCommands extends RegionCommandsBase {
             DomainInputResolver resolver = new DomainInputResolver(
                     WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
             resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_AND_NAME);
-            resolver.setActor(sender);
-            resolver.setRegion(region);
 
             callable = resolver;
         }
@@ -233,8 +217,6 @@ public class MemberCommands extends RegionCommandsBase {
             DomainInputResolver resolver = new DomainInputResolver(
                     WorldGuard.getInstance().getProfileService(), args.getParsedPaddedSlice(1, 0));
             resolver.setLocatorPolicy(args.hasFlag('n') ? UserLocatorPolicy.NAME_ONLY : UserLocatorPolicy.UUID_AND_NAME);
-            resolver.setActor(sender);
-            resolver.setRegion(region);
 
             callable = resolver;
         }

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommands.java

@@ -59,7 +59,7 @@ import com.sk89q.worldguard.protection.FlagValueCalculator;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
 import com.sk89q.worldguard.protection.flags.Flags;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 import com.sk89q.worldguard.protection.flags.RegionGroup;
 import com.sk89q.worldguard.protection.flags.RegionGroupFlag;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
@@ -159,7 +159,7 @@ public final class RegionCommands extends RegionCommandsBase {
             region = checkRegionFromSelection(sender, id);
         }
 
-        RegionAdder task = new RegionAdder(manager, region, sender);
+        RegionAdder task = new RegionAdder(manager, region);
         task.addOwnersFromCommand(args, 2);
 
         final String description = String.format("Adding region '%s'", region.getId());
@@ -213,7 +213,7 @@ public final class RegionCommands extends RegionCommandsBase {
 
         region.copyFrom(existing);
 
-        RegionAdder task = new RegionAdder(manager, region, sender);
+        RegionAdder task = new RegionAdder(manager, region);
 
         final String description = String.format("Updating region '%s'", region.getId());
         AsyncCommandBuilder.wrap(task, sender)
@@ -587,7 +587,7 @@ public final class RegionCommands extends RegionCommandsBase {
             // the [value] part throws an error.
             try {
                 groupValue = groupFlag.parseInput(FlagContext.create().setSender(sender).setInput(group).setObject("region", existing).build());
-            } catch (InvalidFlagFormatException e) {
+            } catch (InvalidFlagFormat e) {
                 throw new CommandException(e.getMessage());
             }
 
@@ -598,7 +598,7 @@ public final class RegionCommands extends RegionCommandsBase {
             // Set the flag if [value] was given even if [-g group] was given as well
             try {
                 value = setFlag(existing, foundFlag, sender, value).toString();
-            } catch (InvalidFlagFormatException e) {
+            } catch (InvalidFlagFormat e) {
                 throw new CommandException(e.getMessage());
             }
 

worldguard-core/src/main/java/com/sk89q/worldguard/commands/region/RegionCommandsBase.java

@@ -45,7 +45,7 @@ import com.sk89q.worldguard.internal.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.ApplicableRegionSet;
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 import com.sk89q.worldguard.protection.managers.RegionManager;
 import com.sk89q.worldguard.protection.regions.GlobalProtectedRegion;
 import com.sk89q.worldguard.protection.regions.ProtectedCuboidRegion;
@@ -430,9 +430,9 @@ class RegionCommandsBase {
      * @param flag the flag
      * @param sender the sender
      * @param value the value
-     * @throws InvalidFlagFormatException thrown if the value is invalid
+     * @throws InvalidFlagFormat thrown if the value is invalid
      */
-    protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sender, String value) throws InvalidFlagFormatException {
+    protected static <V> V setFlag(ProtectedRegion region, Flag<V> flag, Actor sender, String value) throws InvalidFlagFormat {
         V val = flag.parseInput(FlagContext.create().setSender(sender).setInput(value).setObject("region", region).build());
         region.setFlag(flag, val);
         return val;

worldguard-core/src/main/java/com/sk89q/worldguard/commands/task/RegionAdder.java

@@ -20,7 +20,6 @@
 package com.sk89q.worldguard.commands.task;
 
 import com.sk89q.minecraft.util.commands.CommandContext;
-import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.managers.RegionManager;
@@ -40,7 +39,6 @@ public class RegionAdder implements Callable<ProtectedRegion> {
 
     private final RegionManager manager;
     private final ProtectedRegion region;
-    private final Actor actor;
     @Nullable
     private String[] ownersInput;
     private UserLocatorPolicy locatorPolicy = UserLocatorPolicy.UUID_ONLY;
@@ -48,26 +46,15 @@ public class RegionAdder implements Callable<ProtectedRegion> {
     /**
      * Create a new instance.
      *
-     * @param manager the manager
+     * @param manager the manage
      * @param region the region
      */
     public RegionAdder(RegionManager manager, ProtectedRegion region) {
-        this(manager, region, null);
-    }
-
-    /**
-     * Create a new instance.
-     * @param manager the manager
-     * @param region the region
-     * @param actor the actor
-     */
-    public RegionAdder(RegionManager manager, ProtectedRegion region, Actor actor) {
         checkNotNull(manager);
         checkNotNull(region);
 
         this.manager = manager;
         this.region = region;
-        this.actor = actor;
     }
 
     /**
@@ -88,9 +75,6 @@ public class RegionAdder implements Callable<ProtectedRegion> {
         if (ownersInput != null) {
             DomainInputResolver resolver = new DomainInputResolver(WorldGuard.getInstance().getProfileService(), ownersInput);
             resolver.setLocatorPolicy(locatorPolicy);
-            resolver.setActor(actor);
-            resolver.setRegion(region);
-
             DefaultDomain domain = resolver.call();
             region.getOwners().addAll(domain);
         }

worldguard-core/src/main/java/com/sk89q/worldguard/config/ConfigurationManager.java

@@ -65,6 +65,7 @@ public abstract class ConfigurationManager {
             "#\r\n";
 
     public boolean useRegionsCreatureSpawnEvent;
+    public boolean useRegionsPreCreatureSpawnEvent;
     public boolean activityHaltToggle = false;
     public boolean useGodPermission;
     public boolean useGodGroup;

worldguard-core/src/main/java/com/sk89q/worldguard/config/YamlConfigurationManager.java

@@ -56,6 +56,7 @@ public abstract class YamlConfigurationManager extends ConfigurationManager {
         migrateRegionsToUuid = config.getBoolean("regions.uuid-migration.perform-on-next-start", true);
         keepUnresolvedNames = config.getBoolean("regions.uuid-migration.keep-names-that-lack-uuids", true);
         useRegionsCreatureSpawnEvent = config.getBoolean("regions.use-creature-spawn-event", true);
+        useRegionsPreCreatureSpawnEvent = config.getBoolean("regions.use-pre-creature-spawn-event", true);
         disableDefaultBypass = config.getBoolean("regions.disable-bypass-by-default", false);
         announceBypassStatus = config.getBoolean("regions.announce-bypass-status", false);
 

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

@@ -1,108 +0,0 @@
-/*
- * 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.LocalPlayer;
-import com.sk89q.worldguard.domains.registry.CustomDomainContext;
-import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException;
-import com.sk89q.worldguard.util.ChangeTracked;
-
-import java.util.regex.Pattern;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public abstract class CustomDomain implements Domain, ChangeTracked {
-    private static final Pattern VALID_NAME = Pattern.compile("^[a-z0-9\\-]{1,40}$");
-
-    private final String name;
-    private boolean dirty;
-
-    public CustomDomain(String name) {
-        if (name == null ||!isValidName(name)) {
-            throw new IllegalArgumentException("Invalid Domain name used.");
-        }
-        this.name = name;
-    }
-
-    /**
-     * Get the name of the domain resolver.
-     *
-     * @return The name of the domain
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Parse a given input to fill the context of the CustomDomain.
-     *
-     * @param context the {@link CustomDomainContext}
-     * @throws InvalidDomainFormatException Raised if the input is invalid
-     */
-    public abstract void parseInput(CustomDomainContext context) throws InvalidDomainFormatException;
-
-    /**
-     * Convert a raw type that was loaded (from a YAML file, for example)
-     * into the custom domain.
-     *
-     * @param o The object
-     */
-    public abstract void unmarshal(Object o);
-
-    /**
-     * Convert the current Domain to a storable foramt
-     *
-     * @return The marshalled type
-     */
-    public abstract Object marshal();
-
-    /**
-     * Test whether a flag name is valid.
-     *
-     * @param name The flag name
-     * @return Whether the name is valid
-     */
-    public static boolean isValidName(String name) {
-        checkNotNull(name, "name");
-        // g is already reserved by the group domain
-        return VALID_NAME.matcher(name).matches() && !name.equalsIgnoreCase("g");
-    }
-
-
-    @Override
-    public boolean contains(LocalPlayer player) {
-        return contains(player.getUniqueId());
-    }
-
-    @Override
-    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

@@ -22,6 +22,8 @@ package com.sk89q.worldguard.domains;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.sk89q.worldguard.util.profile.Profile;
+import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 import com.sk89q.worldedit.util.formatting.text.Component;
 import com.sk89q.worldedit.util.formatting.text.TextComponent;
 import com.sk89q.worldedit.util.formatting.text.event.ClickEvent;
@@ -29,19 +31,14 @@ import com.sk89q.worldedit.util.formatting.text.event.HoverEvent;
 import com.sk89q.worldedit.util.formatting.text.format.TextColor;
 import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.util.ChangeTracked;
-import com.sk89q.worldguard.util.profile.Profile;
-import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 
 import javax.annotation.Nullable;
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -53,9 +50,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
     private PlayerDomain playerDomain = new PlayerDomain();
     private GroupDomain groupDomain = new GroupDomain();
 
-    private final Map<String, CustomDomain> customDomains = new ConcurrentHashMap<>();
-    private boolean customDomainsChanged = false;
-
     /**
      * Create a new domain.
      */
@@ -70,7 +64,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
     public DefaultDomain(DefaultDomain existing) {
         setPlayerDomain(existing.getPlayerDomain());
         setGroupDomain(existing.getGroupDomain());
-        setCustomDomains(existing.customDomains);
     }
 
     /**
@@ -111,72 +104,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
         this.groupDomain = new GroupDomain(groupDomain);
     }
 
-    /**
-     * Add new custom domains
-     *
-     * @param customDomain a domain
-     */
-    public void addCustomDomain(CustomDomain customDomain) {
-        checkNotNull(customDomain);
-        this.customDomains.put(customDomain.getName(), customDomain);
-        this.customDomainsChanged = true;
-    }
-
-    /**
-     * Remove a custom domain matched by the name
-     *
-     * @param name the name
-     */
-    public void removeCustomDomain(String name) {
-        checkNotNull(name);
-        if (this.customDomains.remove(name) != null) {
-            this.customDomainsChanged = true;
-        }
-    }
-
-    /**
-     * Remove a custom domain
-     *
-     * @param customDomain a domain
-     */
-    public void removeCustomDomain(CustomDomain customDomain) {
-        checkNotNull(customDomain);
-        if (this.customDomains.remove(customDomain.getName()) != null) {
-            this.customDomainsChanged = true;
-        }
-    }
-
-    /**
-     * Set the api domains to a specified value
-     *
-     * @param customDomains the domains
-     */
-    public void setCustomDomains(Map<String, CustomDomain> customDomains) {
-        checkNotNull(customDomains);
-        this.customDomains.clear();
-        this.customDomains.putAll(customDomains);
-        this.customDomainsChanged = true;
-    }
-
-    /**
-     * Get all api domains
-     *
-     * @return a unmodifiable copy of the domains
-     */
-    public Collection<CustomDomain> getCustomDomains() {
-        return Collections.unmodifiableCollection(this.customDomains.values());
-    }
-
-    /**
-     * Get the api domain specified by its name
-     *
-     * @param name the name of the domain
-     * @return the custom domain
-     */
-    public @Nullable CustomDomain getCustomDomain(String name) {
-        return this.customDomains.get(name);
-    }
-
     /**
      * Add the given player to the domain, identified by the player's name.
      *
@@ -248,9 +175,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
         for (String group : other.getGroups()) {
             addGroup(group);
         }
-        for (CustomDomain domain : other.getCustomDomains()) {
-            addCustomDomain(domain);
-        }
     }
 
     /**
@@ -269,9 +193,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
         for (String group : other.getGroups()) {
             removeGroup(group);
         }
-        for (CustomDomain domain : other.getCustomDomains()) {
-            removeCustomDomain(domain.getName());
-        }
     }
 
     /**
@@ -321,12 +242,12 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
     @Override
     public boolean contains(LocalPlayer player) {
-        return playerDomain.contains(player) || groupDomain.contains(player) || customDomains.values().stream().anyMatch(d -> d.contains(player));
+        return playerDomain.contains(player) || groupDomain.contains(player);
     }
 
     @Override
     public boolean contains(UUID uniqueId) {
-        return playerDomain.contains(uniqueId) || customDomains.values().stream().anyMatch(d -> d.contains(uniqueId));
+        return playerDomain.contains(uniqueId);
     }
 
     @Override
@@ -336,7 +257,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
     @Override
     public int size() {
-        return groupDomain.size() + playerDomain.size() + customDomains.size();
+        return groupDomain.size() + playerDomain.size();
     }
 
     @Override
@@ -354,6 +275,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
     }
 
     public String toPlayersString(@Nullable ProfileCache cache) {
+        StringBuilder str = new StringBuilder();
         List<String> output = new ArrayList<>();
 
         for (String name : playerDomain.getPlayers()) {
@@ -377,7 +299,13 @@ public class DefaultDomain implements Domain, ChangeTracked {
         }
 
         output.sort(String.CASE_INSENSITIVE_ORDER);
-        return String.join(", ", output);
+        for (Iterator<String> it = output.iterator(); it.hasNext();) {
+            str.append(it.next());
+            if (it.hasNext()) {
+                str.append(", ");
+            }
+        }
+        return str.toString();
     }
     
     public String toGroupsString() {
@@ -392,20 +320,25 @@ public class DefaultDomain implements Domain, ChangeTracked {
         return str.toString();
     }
 
-    public String toCustomDomainsString() {
-        List<String> output = new ArrayList<>();
-        for (CustomDomain customDomain : customDomains.values()) {
-            output.add(customDomain.getName() + ":" + customDomain.toString());
-        }
-        output.sort(String.CASE_INSENSITIVE_ORDER);
-        return String.join(", ", output);
-    }
-
     public String toUserFriendlyString() {
-        return toUserFriendlyString(null);
+        StringBuilder str = new StringBuilder();
+
+        if (playerDomain.size() > 0) {
+            str.append(toPlayersString());
+        }
+
+        if (groupDomain.size() > 0) {
+            if (str.length() > 0) {
+                str.append("; ");
+            }
+
+            str.append(toGroupsString());
+        }
+
+        return str.toString();
     }
 
-    public String toUserFriendlyString(@Nullable ProfileCache cache) {
+    public String toUserFriendlyString(ProfileCache cache) {
         StringBuilder str = new StringBuilder();
 
         if (playerDomain.size() > 0) {
@@ -419,12 +352,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
 
             str.append(toGroupsString());
         }
-        if (!customDomains.isEmpty()) {
-            if (str.length() > 0) {
-                str.append("; ");
-            }
-            str.append(toCustomDomainsString());
-        }
 
         return str.toString();
     }
@@ -440,12 +367,6 @@ public class DefaultDomain implements Domain, ChangeTracked {
             }
             builder.append(toGroupsComponent());
         }
-        if (!customDomains.isEmpty()) {
-            if (playerDomain.size() > 0 || groupDomain.size() > 0) {
-                builder.append(TextComponent.of("; "));
-            }
-            builder.append(toCustomDomainsComponent());
-        }
         return builder.build();
     }
 
@@ -521,39 +442,21 @@ public class DefaultDomain implements Domain, ChangeTracked {
         return builder.build();
     }
 
-    private Component toCustomDomainsComponent() {
-        final TextComponent.Builder builder = TextComponent.builder("");
-        for (Iterator<CustomDomain> it = customDomains.values().iterator(); it.hasNext(); ) {
-            CustomDomain domain = it.next();
-            builder.append(TextComponent.of(domain.getName() + ":", TextColor.LIGHT_PURPLE))
-                    .append(TextComponent.of(domain.toString(), TextColor.GOLD));
-            if (it.hasNext()) {
-                builder.append(TextComponent.of(", "));
-            }
-        }
-        return builder.build().hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TextComponent.of("CustomDomain")));
-    }
-
-
     @Override
     public boolean isDirty() {
-        return playerDomain.isDirty() || groupDomain.isDirty() ||
-                customDomainsChanged ||  customDomains.values().stream().anyMatch(ChangeTracked::isDirty);
+        return playerDomain.isDirty() || groupDomain.isDirty();
     }
 
     @Override
     public void setDirty(boolean dirty) {
         playerDomain.setDirty(dirty);
         groupDomain.setDirty(dirty);
-        customDomainsChanged = dirty;
-        customDomains.values().forEach(d -> d.setDirty(dirty));
     }
 
     @Override
     public String toString() {
         return "{players=" + playerDomain +
                 ", groups=" + groupDomain +
-                ", custom=" + customDomains +
                 '}';
     }
 

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

@@ -1,98 +0,0 @@
-/*
- * 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.registry;
-
-import com.google.common.collect.Maps;
-import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldguard.commands.CommandInputContext;
-
-import javax.annotation.Nullable;
-import java.util.Map;
-
-public final class CustomDomainContext extends CommandInputContext<InvalidDomainFormatException> {
-
-    private CustomDomainContext(Actor sender, String input, Map<String, Object> values) {
-        super(sender, input, values);
-    }
-
-
-    public static CustomDomainContext.CustomDomainContextBuilder create() {
-        return new CustomDomainContext.CustomDomainContextBuilder();
-    }
-
-    /**
-     * Create a copy of this CustomDomainContext, with optional substitutions for values
-     *
-     * <p>If any supplied variable is null, it will be ignored.
-     * If a map is supplied, it will override this CustomDomainContext's values of the same key,
-     * but unprovided keys will not be overriden and will be returned as shallow copies.</p>
-     *
-     * @param commandSender CommandSender for the new CustomDomainContext to run under
-     * @param s String of the user input for the new CustomDomainContext
-     * @param values map of values to override from the current CustomDomainContext
-     * @return a copy of this CustomDomainContext
-     */
-    public CustomDomainContext copyWith(@Nullable Actor commandSender, @Nullable String s, @Nullable Map<String, Object> values) {
-        Map<String, Object> map = Maps.newHashMap();
-        map.putAll(context);
-        if (values != null) {
-            map.putAll(values);
-        }
-        return new CustomDomainContext(commandSender == null ? this.sender : commandSender, s == null ? this.input : s, map);
-    }
-
-    @Override
-    protected InvalidDomainFormatException createException(String str) {
-        return new InvalidDomainFormatException(str);
-    }
-
-    public static class CustomDomainContextBuilder {
-        private Actor sender;
-        private String input;
-        private Map<String, Object> map = Maps.newHashMap();
-
-        public CustomDomainContextBuilder setSender(Actor sender) {
-            this.sender = sender;
-            return this;
-        }
-
-        public CustomDomainContextBuilder setInput(String input) {
-            this.input = input;
-            return this;
-        }
-
-        public CustomDomainContextBuilder setObject(String key, Object value) {
-            this.map.put(key, value);
-            return this;
-        }
-
-        public boolean tryAddToMap(String key, Object value) {
-            if (map.containsKey(key)) return false;
-            this.map.put(key, value);
-            return true;
-        }
-
-        public CustomDomainContext build() {
-            return new CustomDomainContext(sender, input, map);
-        }
-    }
-
-}
-

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

@@ -1,26 +0,0 @@
-/*
- * 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.registry;
-
-public class DomainConflictException extends RuntimeException {
-    public DomainConflictException(String message) {
-        super(message);
-    }
-}

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

@@ -1,28 +0,0 @@
-/*
- * 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.registry;
-
-import com.sk89q.worldguard.domains.CustomDomain;
-
-@FunctionalInterface
-public interface DomainFactory<T extends CustomDomain> {
-    T create(String name);
-}

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

@@ -1,94 +0,0 @@
-/*
- * 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.registry;
-
-import com.sk89q.worldguard.domains.CustomDomain;
-
-import javax.annotation.Nullable;
-import java.util.List;
-import java.util.Map;
-
-public interface DomainRegistry extends Iterable<DomainFactory<?>> {
-
-    /**
-     * Register a new Domain
-     *
-     * <p>There may be an appropiate time to register domains. if domains are
-     * registered outside this time, then an exception may be thrown.</p>
-     *
-     * @param domain The domain
-     * @throws DomainConflictException Thrown when already an existing domain exists with the same name
-     * @throws IllegalStateException If it is not the right time to register new domains
-     */
-    void register(String name, DomainFactory<?> domain) throws DomainConflictException;
-
-    /**
-     * Register a collection of domains.
-     *
-     * <p>There may be an appropriate time to register domains. If domains are
-     * registered outside this time, then an exception may be thrown.</p>
-     *
-     * <p>If there is a domain conflict, then an error will be logged but
-     * no exception will be thrown.</p>
-     *
-     * @param domains a collection of domain factories
-     * @throws IllegalStateException If it is not the right time to register new domains
-     */
-    void registerAll(Map<String, DomainFactory<?>> domains);
-
-    /**
-     * Get the domain by its name.
-     *
-     * @param name The name
-     * @return The domain, if it has been registered
-     */
-    @Nullable
-    DomainFactory<?> get(String name);
-
-    /**
-     * Try to get a domain by its name
-     */
-    @Nullable
-    CustomDomain createDomain(String name);
-
-    /**
-     * Get all domains keyed by the registered name
-     *
-     * @return All domains
-     */
-    Map<String, DomainFactory<?>> getAll();
-
-    /**
-     * Unmarshal a raw map of values into a list of domains with their
-     * unmarshalled values.
-     *
-     * @param rawValues The raw values map
-     * @param createUnknown Whether "just in time" domains should be created for unknown domains
-     * @return The unmarshalled domain list
-     */
-    Map<String, CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown);
-
-    /**
-     * Get the number of registered domains.
-     *
-     * @return The number of registered domains
-     */
-    int size();
-}

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

@@ -1,28 +0,0 @@
-/*
- * 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.registry;
-
-public class InvalidDomainFormatException extends Exception {
-    private static final long serialVersionUID = 8101615074524004172L;
-
-    public InvalidDomainFormatException(String msg) {
-        super(msg);
-    }
-}

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

@@ -1,166 +0,0 @@
-/*
- * 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.registry;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Maps;
-import com.sk89q.worldguard.domains.CustomDomain;
-
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import static com.google.common.base.Preconditions.checkNotNull;
-
-public class SimpleDomainRegistry implements DomainRegistry {
-    private static final Logger log = Logger.getLogger(SimpleDomainRegistry.class.getCanonicalName());
-
-    private final Object lock = new Object();
-    private final ConcurrentMap<String, DomainFactory<?>> domains = Maps.newConcurrentMap();
-    private boolean initialized = false;
-
-    public boolean isInitialized() {
-        return initialized;
-    }
-
-    public void setInitialized(boolean initialized) {
-        this.initialized = initialized;
-    }
-
-    @Override
-    public void register(String name, DomainFactory<?> domain) throws DomainConflictException {
-        synchronized (lock) {
-            if (initialized) {
-                throw new IllegalStateException("New domains cannot be registered at this time");
-            }
-
-            forceRegister(name, domain);
-        }
-    }
-
-    @Override
-    public void registerAll(Map<String, DomainFactory<?>> domains) {
-        synchronized (lock) {
-            for (Map.Entry<String, DomainFactory<?>> entry : domains.entrySet()) {
-                try {
-                    register(entry.getKey(), entry.getValue());
-                } catch (DomainConflictException e) {
-                    log.log(Level.WARNING, e.getMessage());
-                }
-            }
-        }
-    }
-
-    private <T extends DomainFactory<?>> T forceRegister(String name, T domain) throws DomainConflictException {
-        checkNotNull(domain, "domain");
-        checkNotNull(name, "name");
-
-        if (!CustomDomain.isValidName(name)) {
-            throw new IllegalArgumentException("Invalid Domain name used.");
-        }
-
-        synchronized (lock) {
-            if (domains.containsKey(name)) {
-                throw new DomainConflictException("A domain already exists by the name " + name);
-            }
-
-            domains.put(name, domain);
-        }
-
-        return domain;
-    }
-
-    @Nullable
-    @Override
-    public DomainFactory<?> get(String name) {
-        checkNotNull(name, "name");
-        return domains.get(name.toLowerCase());
-    }
-
-    @Nullable
-    @Override
-    public CustomDomain createDomain(String name) {
-        DomainFactory<?> factory = get(name);
-        if (factory == null) return null;
-        return factory.create(name);
-    }
-
-    @Override
-    public Map<String, DomainFactory<?>> getAll() {
-        return ImmutableMap.copyOf(domains);
-    }
-
-    private CustomDomain getOrCreate(String name, Object value, boolean createUnknown) {
-        CustomDomain customDomain = createDomain(name);
-
-        if (customDomain != null) {
-            customDomain.unmarshal(value);
-            return customDomain;
-        }
-
-        synchronized (lock) {
-            customDomain = createDomain(name); // Load again because the previous load was not synchronized
-            if (customDomain != null) {
-                customDomain.unmarshal(value);
-                return customDomain;
-            }
-            if (createUnknown) {
-                DomainFactory<UnknownDomain> unknownFactory = forceRegister(name, UnknownDomain.FACTORY);
-                if (unknownFactory != null) {
-                    customDomain = unknownFactory.create(name);
-                    if (customDomain != null) customDomain.unmarshal(value);
-                    return customDomain;
-                }
-            }
-        }
-        return null;
-    }
-
-    public Map<String, CustomDomain> unmarshal(Map<String, Object> rawValues, boolean createUnknown) {
-        checkNotNull(rawValues, "rawValues");
-
-        Map<String, CustomDomain> domains = new HashMap<>();
-
-        for (Map.Entry<String, Object> entry : rawValues.entrySet()) {
-            try {
-                CustomDomain domain = getOrCreate(entry.getKey(), entry.getValue(), createUnknown);
-                domains.put(domain.getName(), domain);
-            } catch (Throwable e) {
-                log.log(Level.WARNING, "Failed to unmarshal domain for " + entry.getKey(), e);
-            }
-        }
-        return domains;
-    }
-
-    @Override
-    public int size() {
-        return domains.size();
-    }
-
-    @Override
-    public Iterator<DomainFactory<?>> iterator() {
-        return Iterators.unmodifiableIterator(domains.values().iterator());
-    }
-}

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

@@ -1,88 +0,0 @@
-/*
- * 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.registry;
-
-import com.sk89q.worldguard.domains.CustomDomain;
-
-import java.util.UUID;
-
-public class UnknownDomain extends CustomDomain {
-    public static DomainFactory<UnknownDomain> FACTORY = UnknownDomain::new;
-
-    private boolean isDirty = false;
-    private Object o;
-
-    public UnknownDomain(String name) {
-        super(name);
-    }
-
-    @Override
-    public void parseInput(CustomDomainContext context) throws InvalidDomainFormatException {
-        throw new InvalidDomainFormatException("The plugin that registered this domain is not currently installed");
-    }
-
-    @Override
-    public void unmarshal(Object o) {
-        this.o = o;
-    }
-
-    @Override
-    public Object marshal() {
-        return o;
-    }
-
-    @Override
-    public boolean contains(UUID uniqueId) {
-        return false;
-    }
-
-    @Override
-    public boolean contains(String playerName) {
-        return false;
-    }
-
-    @Override
-    public int size() {
-        return 0;
-    }
-
-    @Override
-    public void clear() {
-        isDirty = true;
-        o = null;
-    }
-
-    @Override
-    public void setDirty(boolean dirty) {
-        isDirty = dirty;
-    }
-
-    @Override
-    public boolean isDirty() {
-        return isDirty;
-    }
-
-    @Override
-    public String toString() {
-        return "UnknownDomain{" +
-                "o=" + o +
-                '}';
-    }
-}

worldguard-core/src/main/java/com/sk89q/worldguard/internal/permission/RegionPermissionModel.java

@@ -176,14 +176,13 @@ public class RegionPermissionModel extends AbstractPermissionModel {
     public boolean mayRemoveOwners(ProtectedRegion region) {
         return hasPatternPermission("removeowner", region);
     }
-
+    
     /**
      * Checks to see if the given sender has permission to modify the given region
      * using the region permission pattern.
      * 
      * @param perm the name of the node
      * @param region the region
-     * @return whether the actor has the permission
      */
     private boolean hasPatternPermission(String perm, ProtectedRegion region) {
         if (!(getSender() instanceof Player)) {

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/BooleanFlag.java

@@ -33,7 +33,7 @@ public class BooleanFlag extends Flag<Boolean> {
     }
 
     @Override
-    public Boolean parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public Boolean parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         
         if (input.equalsIgnoreCase("true") || input.equalsIgnoreCase("yes")
@@ -45,7 +45,7 @@ public class BooleanFlag extends Flag<Boolean> {
                 || input.equalsIgnoreCase("0")) {
             return false;
         } else {
-            throw new InvalidFlagFormatException("Not a yes/no value: " + input);
+            throw new InvalidFlagFormat("Not a yes/no value: " + input);
         }
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/CommandStringFlag.java

@@ -33,7 +33,7 @@ public class CommandStringFlag extends Flag<String> {
     }
 
     @Override
-    public String parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public String parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         input = input.trim();
         if (!input.startsWith("/")) {

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/DoubleFlag.java

@@ -33,7 +33,7 @@ public class DoubleFlag extends NumberFlag<Double> {
     }
 
     @Override
-    public Double parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public Double parseInput(FlagContext context) throws InvalidFlagFormat {
         return context.getUserInputAsDouble();
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EntityTypeFlag.java

@@ -40,12 +40,12 @@ public class EntityTypeFlag extends Flag<EntityType> {
     }
 
     @Override
-    public EntityType parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public EntityType parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         input = input.trim();
         EntityType entityType = unmarshal(input);
         if (entityType == null) {
-            throw new InvalidFlagFormatException("Unknown entity type: " + input);
+            throw new InvalidFlagFormat("Unknown entity type: " + input);
         }
         return entityType;
     }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/EnumFlag.java

@@ -74,12 +74,12 @@ public class EnumFlag<T extends Enum<T>> extends Flag<T> {
     }
 
     @Override
-    public T parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public T parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         try {
             return findValue(input);
         } catch (IllegalArgumentException e) {
-            throw new InvalidFlagFormatException("Unknown value '" + input + "' in "
+            throw new InvalidFlagFormat("Unknown value '" + input + "' in "
                     + enumClass.getName());
         }
     }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/Flag.java

@@ -181,9 +181,9 @@ public abstract class Flag<T> {
      *
      * @param context the {@link FlagContext}
      * @return The coerced type
-     * @throws InvalidFlagFormatException Raised if the input is invalid
+     * @throws InvalidFlagFormat Raised if the input is invalid
      */
-    public abstract T parseInput(FlagContext context) throws InvalidFlagFormatException;
+    public abstract T parseInput(FlagContext context) throws InvalidFlagFormat;
 
     /**
      * Convert a raw type that was loaded (from a YAML file, for example)

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/FlagContext.java

@@ -21,28 +21,106 @@ package com.sk89q.worldguard.protection.flags;
 
 import com.google.common.collect.Maps;
 import com.sk89q.worldedit.extension.platform.Actor;
+import com.sk89q.worldguard.LocalPlayer;
 import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.commands.CommandInputContext;
 
-import javax.annotation.Nullable;
 import java.util.Map;
 
-public final class FlagContext extends CommandInputContext<InvalidFlagFormatException> {
+import javax.annotation.Nullable;
+
+public final class FlagContext {
+
+    private final Actor sender;
+    private final String input;
+
+    private Map<String, Object> context;
 
     private FlagContext(Actor sender, String input, Map<String, Object> values) {
-        super(sender, input, values);
+        this.sender = sender;
+        this.input = input;
+        this.context = values;
     }
 
-    public static FlagContext.FlagContextBuilder create() {
+    public static FlagContextBuilder create() {
         return new FlagContextBuilder();
     }
 
+    public void put(String name, Object value) {
+        context.put(name, value);
+    }
+
+    public Actor getSender() {
+        return sender;
+    }
+
+    public String getUserInput() {
+        return input;
+    }
+
+    /**
+     * Gets the CommandSender as a player.
+     *
+     * @return Player
+     * @throws InvalidFlagFormat if the sender is not a player
+     */
+    public LocalPlayer getPlayerSender() throws InvalidFlagFormat {
+        if (sender.isPlayer() && sender instanceof LocalPlayer) {
+            return (LocalPlayer) sender;
+        } else {
+            throw new InvalidFlagFormat("Not a player");
+        }
+    }
+
+    public Integer getUserInputAsInt() throws InvalidFlagFormat {
+        try {
+            return Integer.parseInt(input);
+        } catch (NumberFormatException e) {
+            throw new InvalidFlagFormat("Not a number: " + input);
+        }
+    }
+
+    public Double getUserInputAsDouble() throws InvalidFlagFormat {
+        try {
+            return Double.parseDouble(input);
+        } catch (NumberFormatException e) {
+            throw new InvalidFlagFormat("Not a number: " + input);
+        }
+    }
+
+    /**
+     * Get an object from the context by key name.
+     * May return null if the object does not exist in the context.
+     *
+     * @param name key name of the object
+     * @return the object matching the key, or null
+     */
+    @Nullable
+    public Object get(String name) {
+        return get(name, null);
+    }
+
+    /**
+     * Get an object from the context by key name.
+     * Will only return null if
+     *  a) you provide null as the default
+     *  b) the key has explicity been set to null
+     *
+     * @param name key name of the object
+     * @return the object matching the key
+     */
+    @Nullable
+    public Object get(String name, Object defaultValue) {
+        Object obj;
+        return (((obj = context.get(name)) != null) || context.containsKey(name)
+            ? obj : defaultValue);
+    }
+
     /**
      * Create a copy of this FlagContext, with optional substitutions for values
      *
-     * <p>If any supplied variable is null, it will be ignored.
+     * If any supplied variable is null, it will be ignored.
      * If a map is supplied, it will override this FlagContext's values of the same key,
-     * but unprovided keys will not be overriden and will be returned as shallow copies.</p>
+     * but unprovided keys will not be overriden and will be returned as shallow copies.
      *
      * @param commandSender CommandSender for the new FlagContext to run under
      * @param s String of the user input for the new FlagContext
@@ -58,11 +136,6 @@ public final class FlagContext extends CommandInputContext<InvalidFlagFormatExce
         return new FlagContext(commandSender == null ? this.sender : commandSender, s == null ? this.input : s, map);
     }
 
-    @Override
-    protected InvalidFlagFormatException createException(String str) {
-        return new InvalidFlagFormatException(str);
-    }
-
     public static class FlagContextBuilder {
         private Actor sender;
         private String input;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/GameModeTypeFlag.java

@@ -40,12 +40,12 @@ public class GameModeTypeFlag extends Flag<GameMode> {
     }
 
     @Override
-    public GameMode parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public GameMode parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         input = input.trim();
         GameMode gamemode = unmarshal(input);
         if (gamemode == null) {
-            throw new InvalidFlagFormatException("Unknown game mode: " + input);
+            throw new InvalidFlagFormat("Unknown game mode: " + input);
         }
         return gamemode;
     }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/IntegerFlag.java

@@ -33,7 +33,7 @@ public class IntegerFlag extends NumberFlag<Integer> {
     }
 
     @Override
-    public Integer parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public Integer parseInput(FlagContext context) throws InvalidFlagFormat {
         return context.getUserInputAsInt();
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormat.java

@@ -19,10 +19,6 @@
 
 package com.sk89q.worldguard.protection.flags;
 
-/**
- * @deprecated replaced by {@link InvalidFlagFormatException}. Will be removed in WorldGuard 8
- */
-@Deprecated(forRemoval = true)
 public class InvalidFlagFormat extends Exception {
     
     private static final long serialVersionUID = 8101615074524004172L;

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/InvalidFlagFormatException.java

@@ -1,28 +0,0 @@
-/*
- * 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.protection.flags;
-
-public class InvalidFlagFormatException extends InvalidFlagFormat {
-    private static final long serialVersionUID = 8101615074524004172L;
-
-    public InvalidFlagFormatException(String msg) {
-        super(msg);
-    }
-}

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/LocationFlag.java

@@ -41,7 +41,7 @@ public class LocationFlag extends Flag<Location> {
     }
 
     @Override
-    public Location parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public Location parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         Player player = context.getPlayerSender();
 
@@ -76,7 +76,7 @@ public class LocationFlag extends Flag<Location> {
                             player.printDebug("WARNING: Flag location is outside of region.");
                         } else {
                             // no permission
-                            throw new InvalidFlagFormatException("You can't set that flag outside of the region boundaries.");
+                            throw new InvalidFlagFormat("You can't set that flag outside of the region boundaries.");
                         }
                     }
                     // clamp height to world limits
@@ -86,7 +86,7 @@ public class LocationFlag extends Flag<Location> {
             }
             return loc;
         }
-        throw new InvalidFlagFormatException("Expected 'here' or x,y,z.");
+        throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
     }
 
     @Override

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/MapFlag.java

@@ -70,7 +70,7 @@ public class MapFlag<K, V> extends Flag<Map<K, V>> {
     }
 
     @Override
-    public Map<K, V> parseInput(final FlagContext context) throws InvalidFlagFormatException {
+    public Map<K, V> parseInput(final FlagContext context) throws InvalidFlagFormat {
 
         final String input = context.getUserInput();
         if (input.isEmpty()) {
@@ -83,7 +83,7 @@ public class MapFlag<K, V> extends Flag<Map<K, V>> {
             final char split = str.indexOf('=') == -1 ? ':' : '=';
             final String[] keyVal = str.split(String.valueOf(split));
             if (keyVal.length != 2) {
-                throw new InvalidFlagFormatException("Input must be in a 'key:value,key1=value1' format. Either ':' or '=' can be used.");
+                throw new InvalidFlagFormat("Input must be in a 'key:value,key1=value1' format. Either ':' or '=' can be used.");
             }
 
             final FlagContext key = context.copyWith(null, keyVal[0], null);

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/RegistryFlag.java

@@ -44,10 +44,10 @@ public class RegistryFlag<T extends Keyed> extends Flag<T> {
     }
 
     @Override
-    public T parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public T parseInput(FlagContext context) throws InvalidFlagFormat {
         final String key = context.getUserInput().trim().toLowerCase(Locale.ROOT);
         return Optional.ofNullable(registry.get(key))
-                .orElseThrow(() -> new InvalidFlagFormatException("Unknown " + registry.getName() + ": " + key));
+                .orElseThrow(() -> new InvalidFlagFormat("Unknown " + registry.getName() + ": " + key));
     }
 
     public Registry<T> getRegistry() {

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/SetFlag.java

@@ -58,7 +58,7 @@ public class SetFlag<T> extends Flag<Set<T>> {
     }
 
     @Override
-    public Set<T> parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public Set<T> parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         if (input.isEmpty()) {
             return Sets.newHashSet();

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StateFlag.java

@@ -78,7 +78,7 @@ public class StateFlag extends Flag<StateFlag.State> {
     }
 
     @Override
-    public State parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public State parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
 
         if (input.equalsIgnoreCase("allow")) {
@@ -88,7 +88,7 @@ public class StateFlag extends Flag<StateFlag.State> {
         } else if (input.equalsIgnoreCase("none")) {
             return null;
         } else {
-            throw new InvalidFlagFormatException("Expected none/allow/deny but got '" + input + "'");
+            throw new InvalidFlagFormat("Expected none/allow/deny but got '" + input + "'");
         }
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/StringFlag.java

@@ -57,7 +57,7 @@ public class StringFlag extends Flag<String> {
     }
 
     @Override
-    public String parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public String parseInput(FlagContext context) throws InvalidFlagFormat {
         String lines = context.getUserInput().replaceAll("(?<!\\\\)\\\\n", "\n").replaceAll("\\\\\\\\n", "\\\\n");
         // Add color codes
         lines = CommandUtils.replaceColorMacros(lines);

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/TimestampFlag.java

@@ -48,7 +48,7 @@ public class TimestampFlag extends Flag<Instant> {
     }
 
     @Override
-    public Instant parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public Instant parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         if ("now".equalsIgnoreCase(input)) {
             return Instant.now();
@@ -61,10 +61,10 @@ public class TimestampFlag extends Flag<Instant> {
                 } else if (parsed instanceof ZonedDateTime) {
                     return ((ZonedDateTime) parsed).toInstant();
                 } else {
-                    throw new InvalidFlagFormatException("Unrecognized input.");
+                    throw new InvalidFlagFormat("Unrecognized input.");
                 }
             } catch (DateTimeParseException ignored) {
-                throw new InvalidFlagFormatException("Expected 'now' or ISO 8601 formatted input.");
+                throw new InvalidFlagFormat("Expected 'now' or ISO 8601 formatted input.");
             }
         }
     }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/UUIDFlag.java

@@ -33,7 +33,7 @@ public class UUIDFlag extends Flag<UUID> {
     }
 
     @Override
-    public UUID parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public UUID parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         if ("self".equalsIgnoreCase(input)) {
             return context.getSender().getUniqueId();
@@ -41,7 +41,7 @@ public class UUIDFlag extends Flag<UUID> {
         try {
             return UUID.fromString(input);
         } catch (IllegalArgumentException e) {
-            throw new InvalidFlagFormatException("Not a valid uuid: " + input);
+            throw new InvalidFlagFormat("Not a valid uuid: " + input);
         }
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/VectorFlag.java

@@ -38,7 +38,7 @@ public class VectorFlag extends Flag<Vector3> {
     }
 
     @Override
-    public Vector3 parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public Vector3 parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
 
         if ("here".equalsIgnoreCase(input)) {
@@ -56,7 +56,7 @@ public class VectorFlag extends Flag<Vector3> {
                 }
             }
 
-            throw new InvalidFlagFormatException("Expected 'here' or x,y,z.");
+            throw new InvalidFlagFormat("Expected 'here' or x,y,z.");
         }
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/WeatherTypeFlag.java

@@ -40,12 +40,12 @@ public class WeatherTypeFlag extends Flag<WeatherType> {
     }
 
     @Override
-    public WeatherType parseInput(FlagContext context) throws InvalidFlagFormatException {
+    public WeatherType parseInput(FlagContext context) throws InvalidFlagFormat {
         String input = context.getUserInput();
         input = input.trim();
         WeatherType weatherType = unmarshal(input);
         if (weatherType == null) {
-            throw new InvalidFlagFormatException("Unknown weather type: " + input);
+            throw new InvalidFlagFormat("Unknown weather type: " + input);
         }
         return weatherType;
     }

worldguard-core/src/main/java/com/sk89q/worldguard/protection/flags/registry/UnknownFlag.java

@@ -21,7 +21,7 @@ package com.sk89q.worldguard.protection.flags.registry;
 
 import com.sk89q.worldguard.protection.flags.Flag;
 import com.sk89q.worldguard.protection.flags.FlagContext;
-import com.sk89q.worldguard.protection.flags.InvalidFlagFormatException;
+import com.sk89q.worldguard.protection.flags.InvalidFlagFormat;
 
 import javax.annotation.Nullable;
 
@@ -32,8 +32,8 @@ public class UnknownFlag extends Flag<Object> {
     }
 
     @Override
-    public Object parseInput(FlagContext context) throws InvalidFlagFormatException {
-        throw new InvalidFlagFormatException("The plugin that registered this flag is not currently installed");
+    public Object parseInput(FlagContext context) throws InvalidFlagFormat {
+        throw new InvalidFlagFormat("The plugin that registered this flag is not currently installed");
     }
 
     @Override

worldguard-core/src/main/java/com/sk89q/worldguard/protection/managers/storage/file/YamlRegionFile.java

@@ -27,8 +27,6 @@ import com.sk89q.util.yaml.YAMLProcessor;
 import com.sk89q.worldedit.math.BlockVector2;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.Vector3;
-import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.CustomDomain;
 import com.sk89q.worldguard.domains.DefaultDomain;
 import com.sk89q.worldguard.protection.flags.FlagUtil;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
@@ -290,12 +288,6 @@ public class YamlRegionFile implements RegionDatabase {
             }
         }
 
-        YAMLNode apiDomains = node.getNode("custom");
-        if (apiDomains != null) {
-            Map<String, CustomDomain> parsedDomains = WorldGuard.getInstance().getDomainRegistry().unmarshal(apiDomains.getMap(), true);
-            domain.setCustomDomains(parsedDomains);
-        }
-
         return domain;
     }
 
@@ -316,14 +308,6 @@ public class YamlRegionFile implements RegionDatabase {
         setDomainData(domainData, "unique-ids", domain.getUniqueIds());
         setDomainData(domainData, "groups", domain.getGroups());
 
-        if (!domain.getCustomDomains().isEmpty()) {
-            Map<String, Object> values = new HashMap<>();
-            for (CustomDomain customDomain : domain.getCustomDomains()) {
-                values.put(customDomain.getName(), customDomain.marshal());
-            }
-            domainData.put("custom", values);
-        }
-
         return domainData;
     }
 

worldguard-core/src/main/java/com/sk89q/worldguard/protection/util/DomainInputResolver.java

@@ -21,12 +21,6 @@ package com.sk89q.worldguard.protection.util;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
-import com.sk89q.worldedit.extension.platform.Actor;
-import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.CustomDomain;
-import com.sk89q.worldguard.domains.registry.CustomDomainContext;
-import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException;
-import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.sk89q.worldguard.util.profile.Profile;
 import com.sk89q.worldguard.util.profile.resolver.ProfileService;
 import com.sk89q.worldguard.util.profile.util.UUIDs;
@@ -49,7 +43,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class DomainInputResolver implements Callable<DefaultDomain> {
 
     private static final Pattern GROUP_PATTERN = Pattern.compile("(?i)^[G]:(.+)$");
-    private static final Pattern CUSTOM_PATTERN = Pattern.compile("(?i)^([A-Za-z0-9\\-]{1,40}):(.*)$");
 
     /**
      * The policy for locating users.
@@ -63,8 +56,6 @@ public class DomainInputResolver implements Callable<DefaultDomain> {
     private final ProfileService profileService;
     private final String[] input;
     private UserLocatorPolicy locatorPolicy = UserLocatorPolicy.UUID_ONLY;
-    private ProtectedRegion region;
-    private Actor actor;
 
     /**
      * Create a new instance.
@@ -98,54 +89,20 @@ public class DomainInputResolver implements Callable<DefaultDomain> {
         this.locatorPolicy = locatorPolicy;
     }
 
-    /**
-     * Set the region for the Resolver
-     * @param region the region
-     */
-    public void setRegion(ProtectedRegion region) {
-        this.region = region;
-    }
-
-    /**
-     * Get the current region from the Resolver
-     * @return the region
-     */
-    public @Nullable ProtectedRegion getRegion() {
-        return region;
-    }
-
-    /**
-     * Set the actor of the Resolver
-     * @param actor the actor
-     */
-    public void setActor(Actor actor) {
-        this.actor = actor;
-    }
-
     @Override
-    public DefaultDomain call() throws UnresolvedNamesException, InvalidDomainFormatException {
+    public DefaultDomain call() throws UnresolvedNamesException {
         DefaultDomain domain = new DefaultDomain();
         List<String> namesToQuery = new ArrayList<>();
 
         for (String s : input) {
-            Matcher groupMatcher = GROUP_PATTERN.matcher(s);
-            Matcher customMatcher = CUSTOM_PATTERN.matcher(s);
-            if (groupMatcher.matches()) {
-                domain.addGroup(groupMatcher.group(1));
-            } else if (customMatcher.matches()) {
-                String domainName = customMatcher.group(1);
-                CustomDomain customDomain = WorldGuard.getInstance().getDomainRegistry().createDomain(domainName);
-                if (customDomain == null) {
-                    throw new InvalidDomainFormatException("No domain named '" + domainName + "' found.");
-                }
-                customDomain.parseInput(CustomDomainContext.create()
-                    .setSender(actor).setInput(customMatcher.group(2)).setObject("region", region).build());
-                domain.addCustomDomain(customDomain);
+            Matcher m = GROUP_PATTERN.matcher(s);
+            if (m.matches()) {
+                domain.addGroup(m.group(1));
             } else {
                 UUID uuid = parseUUID(s);
                 if (uuid != null) {
                     // Try to add any UUIDs given
-                    domain.addPlayer(uuid);
+                    domain.addPlayer(UUID.fromString(UUIDs.addDashes(s.replaceAll("^uuid:", ""))));
                 } else {
                     switch (locatorPolicy) {
                         case NAME_ONLY:

worldguard-core/src/main/java/com/sk89q/worldguard/session/Session.java

@@ -161,11 +161,12 @@ public class Session {
     }
 
     /**
-     * Re-initialize the session.
+     * Restore handler-managed state and then re-initialize the session.
      *
      * @param player The player
      */
     public void resetState(LocalPlayer player) {
+        uninitialize(player);
         initialize(player);
         needRefresh.set(true);
     }

worldguard-core/src/main/java/com/sk89q/worldguard/session/SessionManager.java

@@ -41,14 +41,14 @@ public interface SessionManager {
     boolean hasBypass(LocalPlayer player, World world);
 
     /**
-     * Re-initialize handlers and clear "last position," "last state," etc.
-     * information for all players.
+     * Restore handler-managed state, re-initialize handlers, and clear
+     * "last position," "last state," etc. information for all players.
      */
     void resetAllStates();
 
     /**
-     * Re-initialize handlers and clear "last position," "last state," etc.
-     * information.
+     * Restore handler-managed state, re-initialize handlers, and clear
+     * "last position," "last state," etc. information.
      *
      * @param player The player
      */

worldguard-core/src/main/java/com/sk89q/worldguard/util/WorldGuardExceptionConverter.java

@@ -26,7 +26,6 @@ import com.sk89q.worldedit.internal.command.exception.ExceptionMatch;
 import com.sk89q.worldedit.util.auth.AuthorizationException;
 import com.sk89q.worldedit.util.formatting.component.InvalidComponentException;
 import com.sk89q.worldguard.WorldGuard;
-import com.sk89q.worldguard.domains.registry.InvalidDomainFormatException;
 import com.sk89q.worldguard.protection.managers.storage.StorageException;
 import com.sk89q.worldguard.protection.util.UnresolvedNamesException;
 
@@ -92,11 +91,6 @@ public class WorldGuardExceptionConverter extends ExceptionConverterHelper {
         throw newCommandException(e.getMessage(), e);
     }
 
-    @ExceptionMatch
-    public void convert(InvalidDomainFormatException e) throws CommandException {
-        throw newCommandException(e.getMessage(), e);
-    }
-
     @ExceptionMatch
     public void convert(AuthorizationException e) throws CommandException {
         throw newCommandException("You don't have permission to do that.", e);

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

@@ -1,64 +0,0 @@
-/*
- * 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.InvalidDomainFormatException;
-
-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 InvalidDomainFormatException {
-        throw new InvalidDomainFormatException("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,11 +112,5 @@ public class DefaultDomainTest {
         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));
     }
 }

worldguard-logo.svg

@@ -1 +1 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0" y="0" viewBox="0 0 614.2 143.1" xml:space="preserve"><style>.st4{opacity:.1}.st7{fill:#fff}</style><g id="Layer_2_00000052784576965984388860000017441764153098466226_"><g id="Layer_4"><path d="m242.9 32.2-17.2 64h-10.4l-11.8-38.9-11.8 38.9h-10.4l-17.1-64h13.1l9.9 40.4 11.7-40.4h9.4L220 72.6l10-40.4h12.9zm40.3 40.5c.1 3.6-.3 7.2-1.1 10.7-.7 2.8-2.2 5.5-4.2 7.6-3.7 3.8-8.5 5.8-14.6 5.8s-10.9-1.9-14.5-5.8c-2-2.1-3.5-4.7-4.2-7.6-.8-3.5-1.2-7.1-1.1-10.7 0-8.4 1.8-14.5 5.4-18.3 3.6-3.8 8.4-5.7 14.4-5.7 6.1 0 10.9 1.9 14.5 5.7s5.4 9.9 5.4 18.3zm-11.8 0c0-5.8-.9-9.5-2.7-11.3a7.2 7.2 0 0 0-5.4-2.1 7 7 0 0 0-5.3 2.1c-1.8 1.8-2.7 5.6-2.7 11.3s.9 9.6 2.7 11.4a7 7 0 0 0 5.3 2.1c2 .1 4-.7 5.4-2.1 1.8-1.8 2.7-5.6 2.7-11.4zm52.7-19.5-8.8 8.9a8.6 8.6 0 0 0-6.2-2.8 7 7 0 0 0-5.1 2.1 8.6 8.6 0 0 0-2.4 6.6v28.2h-11.7V49.3h11.4v4.5c2.8-3.3 6.8-5 11.8-5a15 15 0 0 1 11 4.4zm22 43h-6.7c-4.5 0-8-1.4-10.5-4.2a13.3 13.3 0 0 1-3.2-9.2V32.2h11.8v49.9c0 2.8 1.4 4.2 4.1 4.2h4.5v9.9zm42.3 0H377v-4.4a14.6 14.6 0 0 1-11.6 4.9c-4.9 0-8.7-1.4-11.5-4.2a15.8 15.8 0 0 1-4.1-9c-.5-3.6-.7-7.2-.6-10.8-.1-3.6.1-7.2.6-10.7.7-3.9 2-6.9 4.1-9 2.8-2.8 6.6-4.2 11.4-4.2 4.8 0 8.6 1.6 11.4 4.7V32.2h11.8l-.1 64zm-11.8-23.5c0-4.4-.5-7.6-1.3-9.5-1.2-2.6-3.4-3.9-6.6-3.9-3.4 0-5.7 1.5-6.9 4.5-.7 1.8-1 4.8-1 8.9s.3 7.1 1 8.9c1 2.9 3.8 4.8 6.9 4.6 3.2 0 5.4-1.3 6.6-3.9.9-1.9 1.3-5.1 1.3-9.6zm66.5-3c0 9-2 15.5-5.9 19.7a23.7 23.7 0 0 1-17.9 7.4c-6.5.1-12.7-2.4-17.3-7-3-3-4.9-6.9-5.6-11.1-.5-2.7-.7-7.5-.7-14.5s.2-11.8.7-14.5c.7-4.2 2.6-8 5.6-11.1a23.7 23.7 0 0 1 17.3-7c3.8-.1 7.5.5 11 1.9 3.2 1.6 6.2 3.7 8.6 6.3l-8.5 8.5c-1.5-1.6-3.2-3-5-4.1a13 13 0 0 0-6.1-1.3c-3-.1-6 1.1-8 3.4-1.6 1.8-2.5 4.7-2.9 8.6a139 139 0 0 0 0 18.7c.4 4 1.3 6.9 2.9 8.7 2 2.2 5 3.5 8 3.3a11 11 0 0 0 8.5-3.6c1.9-2 2.8-4.9 2.8-8.7V71h-11.4V60.5H443v9.2zm45.2 26.5h-11.4v-4.3c-3 3.2-7.3 5-11.7 4.8-4.6 0-8.3-1.4-11.1-4.1a18 18 0 0 1-4.8-13.3v-30h11.8v28.4c0 2.9.8 5.2 2.5 6.7 1.4 1.3 3.3 2 5.2 1.9 1.9.1 3.8-.6 5.2-1.9 1.7-1.5 2.5-3.7 2.5-6.7V49.3h11.8v46.9zm44.1 0H521v-4a16 16 0 0 1-11.5 4.5c-5.3 0-9.2-1.3-11.9-4.1a14.4 14.4 0 0 1-4-10.6 13 13 0 0 1 4.1-9.8c2.7-2.6 6.7-3.8 11.9-3.8h11V66c0-4.9-2.9-7.4-8.7-7.4-3.4-.2-6.8 1.3-9 3.9l-7.4-7.3c2-2.3 4.5-4 7.3-5.1 3.1-1 6.4-1.5 9.6-1.3 13.3 0 20 5.5 20 16.5v30.9zm-11.8-17.3v-2.5h-9.2c-4.4 0-6.5 1.8-6.5 5.3s2.2 5.4 6.7 5.4c4 0 6.6-1 8-3 .8-1.6 1.1-3.4 1-5.2zm54.1-25.7-8.8 8.9a8.6 8.6 0 0 0-6.2-2.8 7 7 0 0 0-5.1 2.1 8.6 8.6 0 0 0-2.4 6.6v28.2h-11.7V49.3h11.4v4.5c2.8-3.3 6.8-5 11.8-5 4-.1 8 1.5 11 4.4zm39.5 43h-11.4v-4.4a14.6 14.6 0 0 1-11.6 4.9c-4.9 0-8.7-1.4-11.5-4.2a15.8 15.8 0 0 1-4.1-9c-.5-3.6-.7-7.2-.6-10.8-.1-3.6.1-7.2.6-10.7.7-3.9 2-6.9 4.1-9 2.8-2.8 6.6-4.2 11.4-4.2 4.8 0 8.6 1.6 11.4 4.7V32.2h11.8v64zm-11.7-23.5c0-4.4-.4-7.6-1.3-9.5-1.2-2.6-3.4-3.9-6.6-3.9-3.4 0-5.7 1.5-6.8 4.5-.7 1.8-1 4.8-1 8.9s.3 7.1 1 8.9c1 2.9 3.8 4.8 6.8 4.6 3.2 0 5.4-1.3 6.6-3.9.8-1.9 1.3-5.1 1.3-9.6z" fill="#2d2d2d" stroke="#fff" stroke-miterlimit="10"/><g><defs><path id="SVGID_1_" d="M78.5 138.1c-3.8 3.9-10.4 3.4-14.3-.4L5.1 78.5A9.8 9.8 0 0 1 5 64.6l.1-.1L63.6 6c3.9-3.8 11.3-4.7 15.1-.8l59 59c3.9 3.9 3.6 11.1-.2 15l-59 58.9z"/></defs><clipPath id="SVGID_00000145029192010834712300000017443068230347339956_"><use xlink:href="#SVGID_1_" overflow="visible"/></clipPath><g clip-path="url(#SVGID_00000145029192010834712300000017443068230347339956_)"><path fill="none" d="M56.1 65.2h45.2v3H56.1z"/><linearGradient id="SVGID_00000069364478787755211970000003740009090250123963_" gradientUnits="userSpaceOnUse" x1="71.6" y1="142.1" x2="71.6" y2="4.8" gradientTransform="matrix(1 0 0 -1 0 146)"><stop offset="0" stop-color="#006bff"/><stop offset="1" stop-color="#004dff"/></linearGradient><path d="M74.9 1.4a4.8 4.8 0 0 0-6.8 0L32.5 37.1h78.1L74.9 1.4z" fill="url(#SVGID_00000069364478787755211970000003740009090250123963_)"/><g><g class="st4"><path d="M74.9 1.4a4.8 4.8 0 0 0-6.8 0L32.5 37.1h78.1L74.9 1.4z"/></g></g><linearGradient id="SVGID_00000084519624245935921250000012172575822901895094_" gradientUnits="userSpaceOnUse" x1="71.5" y1="142.1" x2="71.5" y2="4.8" gradientTransform="matrix(1 0 0 -1 0 146)"><stop offset="0" stop-color="#006bff"/><stop offset="1" stop-color="#004dff"/></linearGradient><path d="m141.7 68.2-16.4-16.4v4.3h-14v-8h-12v8H42v-8H31v8H16.9v-3.5L1.4 68.2a4.8 4.8 0 0 0 0 6.8l18.5 18.5V60.1H31v11h11v-11h57.2v11h12v-11h11v34.2l19.4-19.4c1.9-1.8 2-4.8.1-6.7z" fill="url(#SVGID_00000084519624245935921250000012172575822901895094_)"/><g><g class="st4"><path d="m141.7 68.2-16.4-16.4v4.3h-14v-8h-12v8H42v-8H31v8H16.9v-3.5L1.4 68.2a4.8 4.8 0 0 0 0 6.8l18.5 18.5V60.1H31v11h11v-11h57.2v11h12v-11h11v34.2l19.4-19.4c1.9-1.8 2-4.8.1-6.7z"/></g></g><linearGradient id="SVGID_00000102525750365294681190000017673805805378204844_" gradientUnits="userSpaceOnUse" x1="71.6" y1="142.2" x2="71.6" y2="4.8" gradientTransform="matrix(1 0 0 -1 0 146)"><stop offset="0" stop-color="#006bff"/><Line truncated
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 614.24 143.11"><defs><style>.cls-1{fill:none;}.cls-2{fill:#2d2d2d;}.cls-3{clip-path:url(#clip-path);}.cls-4{fill:url(#New_Gradient_Swatch_copy);}.cls-5{mask:url(#mask);}.cls-6{opacity:0.1;}.cls-7{fill:url(#New_Gradient_Swatch_copy-2);}.cls-8{mask:url(#mask-2);}.cls-9{fill:url(#New_Gradient_Swatch_copy-3);}.cls-10{mask:url(#mask-3);}.cls-11{fill:#fff;}.cls-12{filter:url(#luminosity-invert);}</style><clipPath id="clip-path"><path class="cls-1" d="M78.54,138.1c-3.85,3.85-10.45,3.45-14.33-.42L5.07,78.54a9.85,9.85,0,0,1-.07-14L63.63,6c3.85-3.85,11.25-4.68,15.13-.8l59,59c3.88,3.88,3.63,11.13-.23,15Z"/></clipPath><linearGradient id="New_Gradient_Swatch_copy" x1="71.56" y1="3.86" x2="71.56" y2="141.19" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#006bff"/><stop offset="1" stop-color="#004dff"/></linearGradient><filter id="luminosity-invert" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB"><feColorMatrix values="-1 0 0 0 1 0 -1 0 0 1 0 0 -1 0 1 0 0 0 1 0"/></filter><mask id="mask" x="29.59" y="-2.48" width="83" height="42" maskUnits="userSpaceOnUse"><g class="cls-12"><image width="83" height="42" transform="translate(29.59 -2.48)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFMAAAAqCAYAAADPn2cJAAAACXBIWXMAAAsSAAALEgHS3X78AAAGoklEQVRoQ+2bWXObQBCEGxDLcsjR6eT//7vEcbmcyDE3eVD11jBaST50PXiqKKILlo+entnFCQAM+IqTRHjsC1/x9pgc+8I1IwxDRFEEAAiCAH3fu+0W42ZhTiYTWGthjHFA27ZF0zQoyxJt2x45wuXjJmHGcYyiKJDn+Qhm13Wo6xovLy/YbDZomubIkS4bNwczSRJ8+/ZtBDMMt9be9z3qukaSJDDG4Pn5GWVZHjni5eKmYFprMZ/PcXd3h+l0iizLEMfxSJlN0yBJEsRxjDAM8fT0dDNAbwamtRar1Qrz+RzT6RRFUcBaiyRJRsqsqsq9T9CPj494fX09cobzx03ATNMUq9UKy+USs9kM0+kUeZ7DWutVZlmWDuZkMkEYhnh4eLg60KvDzLIM6/Uay+USi8Vi5JcynYGtMpum2VFnGIYO6MvLy5Ezni+uCjPLMtzf32O9XmOxWGA2m+Hu7g5FUSDLsqMwqcwoihBFEYIgwK9fv64G9Gow8zzH9+/fsVqtnFfOZjMURYGiKJCm6VGYxhgkSeKABkHggG42myMjOH1cBSZB3t/fY7lcOq+UKU6Y9ERgC7NtW5Rl6dKcfShhhmGIIAgwDMPFFXpxmHme48ePH1iv1zteOZ1OXUskZz+yALVtizRNXREyxjhl0juB7fTz58+f+Pv376HhnDQuCpMg6ZMEOZ/PnSqZ4tITtTLZa/pAMtX5m2EYLpbyF4MpQcr0plfKwpOmKYwxDlYQBAC2YNq2Hc2C4jh27ROhEugwbFcXL6XQi8DUINlTEiRTPM/zUYpLSMA2zdlr1nU9quZSmQB29pdQ6Nlh7gMp05sznizLXEtEmNIHufwmYUpF+mACuJhCzwpTVm16pATJ2Q5hsoLLmQ+rNLCF0nXdTmrr9GYMw+A2vu77/mxV/mwwsyxzINlLMrUlSO2VcprI4iNhsggRIj1Vf88XUqHnSPmzwCTI9Xq9k9bSIyVImd5siWSKM/q+dxClGiVIqUTeAG7y9b9//3bG/pk4OUw5RZQgZ7PZCKT2SRYdVnCpNBm+NkiDPASRewAnn3qeFGaapg6iVCIhUolylsOeUk4NtRp1BEHgKjxjH8S2bV0X0HXd6BkSv3uq1aaTwbTW7i0yhJjnuYNorXUeqRX51pBAj0H0Ae26DsMw4OHh4SQpfxKYXNhdLBYupaUS8zzfUaNuut8LkhGG2yeYcRyPWqc0TdG2rZsxyb0EK2/CZ1fsPw3TWrvTN/Kxg0xpLkxob5RN90eClVxWd2MM2raFtXYEVkLVYIdhwO/fvz8F9FMwkyQZtToSopzNSIi67ZF95EdDzsfDMHTHj+PYeXFd10jT1DX8hEmgVOfj4yOqqjp2Sm98GKYxZm9hkRCPLUicImRf6QNLK+F4rLXIsswpVKq073s8PT19COiHYMZx7CBKkNIPZfMtZyq6jem6zr2/rx06FLLosPUhXAmWFqChUq3SBgj0vc/l3w0zjmPXJ3JxgtWZ00C9AEFAsopybZKf6dXyQ1D19JBFR6YtVeYDK9VqrUVVVQ6qLE5//vx5F9B3wZxMJsjz/CBELk7oKSDhUQEsOPJzpqZWqJ4mcs/CIW+O9kQJlsciVN50+qq11v2Wv9tsNm/+U5w3w4yiCFmWjSD65tEMDZEApUrbtt2xAl4o4F9G41436F3XOYAEUpYlqqryFhuGzwKste77fb+ddr4F6JtgRlHkTFtDlKnpA1hVlVeF2g58xWlfuyS9UcKUyqdCq6oabbLg8Di+gmWMgbXWwX99fUXXdd7xMI7CZDr4WhupGF5IXdcjlTINeZGEKCu8hikVrL1TqpLH3geUCvVBresadV2PFMjzyX61abaPSLpu+0djh4AehEmQvqeAvKtahTqNm6aBMQZVVY18VTfsPK5UOuCHyb2u5NI7pUK5EWJVVc4C+J60AILluIwxo4ImbULGXpi8MAlQp7IuJBosZzoaYByPV8hl1ZcprkEyOAad6hKo9FCtVKlWKlT6qwTHsVCt8rw6vDClh2hYhwAyfSU8mc4yrWkFMq0lUI7DFzrVJVyCkJXcp9Z9gOVGsARHqLxxGuhemNIPOTipTJ6cSpOK0/B8RUaD9MHkWGTINJfj03uqVO4JWO6leiVwvecxfHwYOzA1RN4ZqtIHR9rBIWhvUeIhkAx5AT6VcuPYtbdqwNoe+Fqrm+/viwDY/a8rvouTfqY3Hxyf2uSmzyP3vrEwfF7lU6v+t7YD32v9md58x5bhhfkVH4uPLSJ+hTf+A45XAcRn3tf4AAAAAElFTkSuQmCC"/></g></mask><linearGradient id="New_Gradient_Swatch_copy-2" x1="71.55" y1="3.86" x2="71.55" y2="141.19" xlink:href="#New_Gradient_Swatch_copy"/><mask id="mask-2" x="-2.41" y="45.52" width="148" height="51" maskUnits="userSpaceOnUse"><g class="cls-12"><image width="148" height="51" transform="translate(-2.41 45.52)" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJQAAAAzCAYAAABxJSGCAAAACXBIWXMAAAsSAAALEgHS3X78AAAInklEQVR4Xu1d63arvA4cY65J3/9BdxpuBnN+5IwRhiRA0n609azFSgMJYGk0koWztwIwICDgTYiefSAgYAviZx/4Diil3Cs3iWEYJttvB8cfRdHENgRtcES7HIJQAKC1RhzHiKJoYshhGGCtRd/3bjuK8b4ScRzPbEJYa2GtRdd1h7PJIQgVRRHiOEaSJEiSBFprZ0Aarus6GGNgrT2M8b4KURRBa40sy5CmqSOVUmoSYG3bomkaWGufnfLbcAhCKaWgtUaSJMiybEYorTWUUuj7fpYOfyOUUs4WaZoiSZKJavd9j67rnE2MMU/O+H04BKGAW8qj8RiRwI1QjExjzJ8hFANM2oRj77oOURRhGIbJ/iPgEISiAVkzcGOtAEyV6reD9mAZwLTHwGKw9X0/Cb6tWCr0X8VbCPXqjbHoJJEo8VprVzORcH+BUL4tZF0pCdV13UsKpZRy53xXbfoyoRhNwI1Mfd8/+cYcURQ5o3F2o7XGMAwz9eK1fjN8O8jZHm1irZ2o+R6QuMA4+Xm1wN93J/8Hb4jKYa11g/Z7I/xb9lUYIXmeu/NQmRiFSinEcYy+75EkCfI8n02V3xFZ/xV8e2itnT18UsnUJtWrKAo3E37Uk+K1mBFkbcZZozFmlygQuwkli0ZJKDqb9c/SACWZ0jR15+BAeQyAk3gSLU3TWQvBP//RCeanKI5X2kMGGMfuE4JES9MURVGgaRpnewBOzfxr0HfMCvRdkiSo6xpN06DrOuzBLkJxEHmeOzIAcIQyxswiRjqZg5MGI5G4yc9KAjKKGUVSon0VPDKWxiiVyB+ztIt/nJmC9gamtpDnj+MYWZY5dSKhhmGYzLCrqtpFqs2EoiSfTqdJ042FHfOw73BfNbhf67HwJnxS8fu8xiMFPLine truncated