Release 7.0.3 for MC 1.14/1.15.

Last release before switching to 1.16.
Changelog for 7.0.3.
2020-06-25 23:40:40 -04:00 · 2020-06-25 23:11:51 -04:00 · 2020-06-25 22:57:28 -04:00 · 2020-06-24 10:42:12 -04:00 · 2020-06-21 17:25:38 -04:00 · 2020-06-21 16:57:58 -04:00
31 changed files with 725 additions and 194 deletions
@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Report a way in which WorldGuard is not working as intended
+title: ''
+labels: type:bug, status:pending
+assignees: ''
+
+---
+
+**Versions**
+<!-- Please include the full version of WorldEdit, WorldGuard and the platform (Bukkit/Spigot/Paper) you are running, e.g. output from `/we version`, `/wg version` `/version` commands. Please ensure you are running up to date software before making a bug report. Old versions will recieve little to no support. -->
+WorldEdit version:
+WorldGuard version:
+Platform version:
+
+**Describe the bug**
+<!-- A clear and concise description of what the bug is. -->
+
+**To Reproduce**
+<!-- Steps to reproduce the behavior: -->
+1. ...
+2. ...
+
+**Expected behavior**
+<!-- A clear and concise description of what you expected to happen. -->
+
+**Screenshots**
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+**Additional context**
+<!-- Add any other context about the problem here. -->
@@ -0,0 +1,5 @@
+blank_issues_enabled: false
+contact_links:
+  - name: EngineHub Discord
+    url: https://discord.gg/EngineHub
+    about: Please ask and answer questions here.
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for WorlGuard
+title: ''
+labels: type:feature-request, status:pending
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+**Describe the solution you'd like**
+<!-- A clear and concise description of what you want to happen. -->
+
+**Describe alternatives you've considered**
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+**Additional context**
+<!-- Add any other context or screenshots about the feature request here. -->
@@ -15,3 +15,5 @@ dependency-reduced-pom.xml
 .gradle/
 **/build/
 out/
+
+scripts/
@@ -1,5 +1,38 @@
 # Changelog

+## 7.0.3
+
+* This is the last release supporting MC 1.14 and 1.15.
+* Decouple chest-access flag from interact flag. IMPORTANT: If you relied on allowing players to access chests via setting
+    the interact flag to allow, you will now need to set the chest-access flag to allow instead (or as well). This does not
+    affect any setups where users were *not* supposed to be able to access chests and other inventories.
+* Add natural-health-regen and natural-hunger-drain flags. Unlike the heal/feed flags, these can not restore or deplete health/hunger.
+* Fix the interact flag allowing breaking of turtle eggs (now tied directly to block-trampling flag).
+* Fix a memory leak that could occur with many many explosives.
+* Add regions.titles-always-use-default-times config option. Set this to true if you use greeting/farewell titles and another plugin
+    makes the titles disappear too quickly.
+* Add protection for cauldrons water level changing.
+* Improve diagnostic hints and information, such as spawn protection warnings, flag colors in region info, etc.
+* Fix waterlogged blocks bypassing water-flow flag.
+* Workaround for a CraftBukkit change that made no-physics-sand/gravel non-functional.
+* Workaround for CraftBukkit throttling move events.
+* Track projectiles shot by dispensers.
+* Allowed setting passthrough allow on global to unprotect it if members/owners are added.
+* Add support for newer forge clients (FML2) in host keys.
+* Allow using WorldEdit's `//world <worldname>` command to select a world for region commands. This removes the need to
+    use `-w <worldname>` in every command when running commands from console.
+* Add a teleport-message flag, shown when using `/rg tp`.
+* Add coral-fade flag, which prevents corals from drying when out of water.
+* Fix spammy deny-message when walking over redstone ore with certain flag setups.
+* Improve handling of interacting with various tools in hand that didn't modify blocks. (eg opening a chest with an axe in hand)
+* Fix allow-all-interact option not being read from per-world configs.
+* Fix misattribution of pets (eg wolves) in PvP.
+* Improve performance of hopper checks when on recent builds of Paper.
+* Add event-handling.break-hoppers-on-denied-move config option to prevent hoppers from being broken (but items still won't be moved).
+* Note to developers using the WorldGuard API: If you specifically relied on flags such as greeting/farewell, deny-message, etc being
+    StringFlags, be warned that this will change in a future version to support JSON text components. Please plan accordingly.
+
+
 ## 7.0.2
 * Update to MC 1.15. Still compatible with 1.14, and incompatible with 1.13, as before.
 * Add an informational message when defining a region that overlaps vanilla spawn protection.
@@ -1,2 +1,2 @@
 group=com.sk89q.worldguard
-version=7.0.2
+version=7.0.3
@@ -24,11 +24,11 @@ repositories {
 dependencies {
    "compile"(project(":worldguard-core"))
    //"compile"(project(":worldguard-libs:bukkit"))
-    "api"("com.destroystokyo.paper:paper-api:1.15-R0.1-SNAPSHOT")
-    "implementation"("io.papermc:paperlib:1.0.2")
+    "api"("com.destroystokyo.paper:paper-api:1.15.2-R0.1-SNAPSHOT")
+    "implementation"("io.papermc:paperlib:1.0.4")
    "api"("com.sk89q.worldedit:worldedit-bukkit:${Versions.WORLDEDIT}") { isTransitive = false }
    "implementation"("com.sk89q:commandbook:2.3") { isTransitive = false }
-    "implementation"("org.bstats:bstats-bukkit:1.5")
+    "implementation"("org.bstats:bstats-bukkit:1.7")
 }

 tasks.named<Upload>("install") {
@@ -61,10 +61,10 @@ tasks.named<Jar>("jar") {
 tasks.named<ShadowJar>("shadowJar") {
    dependencies {
        relocate("org.bstats", "com.sk89q.worldguard.bukkit.bstats") {
-            include(dependency("org.bstats:bstats-bukkit:1.5"))
+            include(dependency("org.bstats:bstats-bukkit:1.7"))
        }
        relocate ("io.papermc.lib", "com.sk89q.worldguard.bukkit.paperlib") {
-            include(dependency("io.papermc:paperlib:1.0.2"))
+            include(dependency("io.papermc:paperlib:1.0.4"))
        }
    }
 }
@@ -24,6 +24,8 @@ import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.world.weather.WeatherType;
 import com.sk89q.worldedit.world.weather.WeatherTypes;
 import com.sk89q.worldguard.LocalPlayer;
+import com.sk89q.worldguard.WorldGuard;
+import com.sk89q.worldguard.util.MessagingUtil;
 import io.papermc.lib.PaperLib;
 import org.bukkit.BanList.Type;
 import org.bukkit.Bukkit;
@@ -172,7 +174,11 @@ public class BukkitPlayer extends com.sk89q.worldedit.bukkit.BukkitPlayer implem

    @Override
    public void sendTitle(String title, String subtitle) {
-        getPlayer().sendTitle(title, subtitle, -1, -1, -1);
+        if (WorldGuard.getInstance().getPlatform().getGlobalStateManager().get(getWorld()).forceDefaultTitleTimes) {
+            getPlayer().sendTitle(title, subtitle, 10, 70, 20);
+        } else {
+            getPlayer().sendTitle(title, subtitle, -1, -1, -1);
+        }
    }

    @Override
@@ -185,7 +191,10 @@ public class BukkitPlayer extends com.sk89q.worldedit.bukkit.BukkitPlayer implem
        PaperLib.teleportAsync(getPlayer(), BukkitAdapter.adapt(location))
                .thenApply(success -> {
                    if (success) {
-                        print(successMessage);
+                        // The success message can be cleared via flag
+                        if (!successMessage.isEmpty()) {
+                            MessagingUtil.sendStringToChat(this, successMessage);
+                        }
                    } else {
                        printError(failMessage);
                    }
@@ -105,6 +105,13 @@ public class BukkitWorldConfiguration extends YamlWorldConfiguration {

        if (inputs == null || inputs.isEmpty()) {
            parentConfig.setProperty(node, new ArrayList<String>());
+        }
+
+        if (config.getProperty(node) != null) {
+            inputs = config.getStringList(node, null);
+        }
+
+        if (inputs == null || inputs.isEmpty()) {
            return set;
        }

@@ -144,6 +151,7 @@ public class BukkitWorldConfiguration extends YamlWorldConfiguration {
        allowAllInteract = getTargetMatchers("event-handling.interaction-whitelist");
        blockUseAtFeet = getTargetMatchers("event-handling.emit-block-use-at-feet");
        ignoreHopperMoveEvents = getBoolean("event-handling.ignore-hopper-item-move-events", false);
+        breakDeniedHoppers = getBoolean("event-handling.break-hoppers-on-denied-move", true);

        usePaperEntityOrigin = getBoolean("regions.use-paper-entity-origin", false);

@@ -251,12 +259,14 @@ public class BukkitWorldConfiguration extends YamlWorldConfiguration {
        disableVineGrowth = getBoolean("dynamics.disable-vine-growth", false);
        disableCropGrowth = getBoolean("dynamics.disable-crop-growth", false);
        disableSoilDehydration = getBoolean("dynamics.disable-soil-dehydration", false);
+        disableCoralBlockFade = getBoolean("dynamics.disable-coral-block-fade", false);
        allowedSnowFallOver = new HashSet<>(convertLegacyBlocks(getStringList("dynamics.snow-fall-blocks", null)));

        useRegions = getBoolean("regions.enable", true);
        regionInvinciblityRemovesMobs = getBoolean("regions.invincibility-removes-mobs", false);
        regionCancelEmptyChatEvents = getBoolean("regions.cancel-chat-without-recipients", true);
-        regionNetherPortalProtection = getBoolean("regions.nether-portal-protection", false);
+        regionNetherPortalProtection = getBoolean("regions.nether-portal-protection", true);
+        forceDefaultTitleTimes = config.getBoolean("regions.titles-always-use-default-times", true); // note: technically not region-specific, but we only use it for the title flags
        fakePlayerBuildOverride = getBoolean("regions.fake-player-build-override", true);
        explosionFlagCancellation = getBoolean("regions.explosion-flags-block-entity-damage", true);
        highFreqFlags = getBoolean("regions.high-frequency-flags", false);
@@ -20,7 +20,6 @@
 package com.sk89q.worldguard.bukkit;

 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Streams;
 import com.sk89q.bukkit.util.CommandsManagerRegistration;
 import com.sk89q.minecraft.util.commands.CommandException;
 import com.sk89q.minecraft.util.commands.CommandPermissionsException;
@@ -93,9 +92,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.jar.JarFile;
+import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.zip.ZipEntry;

 /**
 * The main class for WorldGuard as a Bukkit plugin.
@@ -214,7 +212,7 @@ public class WorldGuardPlugin extends JavaPlugin {
        ((SimpleFlagRegistry) WorldGuard.getInstance().getFlagRegistry()).setInitialized(true);

        // Enable metrics
-        final Metrics metrics = new Metrics(this);
+        final Metrics metrics = new Metrics(this, 3283); // bStats plugin id
        if (metrics.isEnabled() && platform.getGlobalStateManager().extraStats) {
            setupCustomCharts(metrics);
        }
@@ -488,44 +486,25 @@ public class WorldGuardPlugin extends JavaPlugin {
            return;
        }

-        InputStream input = null;
-        try {
-            JarFile file = new JarFile(getFile());
-            ZipEntry copy = file.getEntry("defaults/" + defaultName);
-            if (copy == null) throw new FileNotFoundException();
-            input = file.getInputStream(copy);
+        try (InputStream stream = getResource("defaults/" + defaultName)){
+            if (stream == null) throw new FileNotFoundException();
+            copyDefaultConfig(stream, actual, defaultName);
        } catch (IOException e) {
-            WorldGuard.logger.severe("Unable to read default configuration: " + defaultName);
+            getLogger().severe("Unable to read default configuration: " + defaultName);
        }

-        if (input != null) {
-            FileOutputStream output = null;
+    }

-            try {
-                output = new FileOutputStream(actual);
-                byte[] buf = new byte[8192];
-                int length = 0;
-                while ((length = input.read(buf)) > 0) {
-                    output.write(buf, 0, length);
-                }
-
-                WorldGuard.logger.info("Default configuration file written: "
-                        + actual.getAbsolutePath());
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                try {
-                    input.close();
-                } catch (IOException ignore) {
-                }
-
-                try {
-                    if (output != null) {
-                        output.close();
-                    }
-                } catch (IOException ignore) {
-                }
+    private void copyDefaultConfig(InputStream input, File actual, String name) {
+        try (FileOutputStream output = new FileOutputStream(actual)) {
+            byte[] buf = new byte[8192];
+            int length;
+            while ((length = input.read(buf)) > 0) {
+                output.write(buf, 0, length);
            }
+            getLogger().info("Default configuration file written: " + name);
+        } catch (IOException e) {
+            getLogger().log(Level.WARNING, "Failed to write default config file", e);
        }
    }

@@ -36,6 +36,7 @@ import org.bukkit.entity.TNTPrimed;
 import org.bukkit.entity.Tameable;
 import org.bukkit.entity.Vehicle;
 import org.bukkit.metadata.Metadatable;
+import org.bukkit.projectiles.BlockProjectileSource;

 import javax.annotation.Nullable;
 import java.util.ArrayList;
@@ -236,6 +237,15 @@ public final class Cause {
        WGMetadata.put(target, CAUSE_KEY, parent);
    }

+    /**
+     * Remove a parent cause from a {@code Metadatable} object.
+     *
+     * @param target the target
+     */
+    public static void untrackParentCause(Metadatable target) {
+        WGMetadata.remove(target, CAUSE_KEY);
+    }
+
    /**
     * Builds causes.
     */
@@ -274,12 +284,14 @@ public final class Cause {
                    } else if (o instanceof AreaEffectCloud) {
                        indirect = true;
                        addAll(((AreaEffectCloud) o).getSource());
-                    } else if (o instanceof Creature && ((Creature) o).getTarget() != null) {
-                        indirect = true;
-                        addAll(((Creature) o).getTarget());
                    } else if (o instanceof Tameable) {
                        indirect = true;
                        addAll(((Tameable) o).getOwner());
+                    } else if (o instanceof Creature && ((Creature) o).getTarget() != null) {
+                        indirect = true;
+                        addAll(((Creature) o).getTarget());
+                    } else if (o instanceof BlockProjectileSource) {
+                        addAll(((BlockProjectileSource) o).getBlock());
                    }

                    // Add manually tracked parent causes
@@ -75,4 +75,13 @@ public final class WGMetadata {
        return null;
    }

+    /**
+     * Removes metadata from the target.
+     *
+     * @param target the target
+     * @param key the key
+     */
+    public static void remove(Metadatable target, String key) {
+        target.removeMetadata(key, WorldGuardPlugin.inst());
+    }
 }
@@ -61,6 +61,7 @@ import org.bukkit.block.Chest;
 import org.bukkit.block.DoubleChest;
 import org.bukkit.block.Hopper;
 import org.bukkit.block.PistonMoveReaction;
+import org.bukkit.block.data.BlockData;
 import org.bukkit.block.data.Waterlogged;
 import org.bukkit.block.data.type.Dispenser;
 import org.bukkit.entity.AreaEffectCloud;
@@ -72,8 +73,10 @@ import org.bukkit.entity.Firework;
 import org.bukkit.entity.Item;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Mob;
 import org.bukkit.entity.Painting;
 import org.bukkit.entity.Player;
+import org.bukkit.entity.Tameable;
 import org.bukkit.entity.ThrownPotion;
 import org.bukkit.entity.minecart.HopperMinecart;
 import org.bukkit.event.Cancellable;
@@ -94,6 +97,7 @@ import org.bukkit.event.block.BlockMultiPlaceEvent;
 import org.bukkit.event.block.BlockPistonExtendEvent;
 import org.bukkit.event.block.BlockPistonRetractEvent;
 import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.CauldronLevelChangeEvent;
 import org.bukkit.event.block.EntityBlockFormEvent;
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.entity.AreaEffectCloudApplyEvent;
@@ -135,6 +139,7 @@ import org.bukkit.event.vehicle.VehicleDamageEvent;
 import org.bukkit.event.vehicle.VehicleDestroyEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 import org.bukkit.inventory.EquipmentSlot;
+import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.projectiles.ProjectileSource;
@@ -154,6 +159,17 @@ public class EventAbstractionListener extends AbstractListener {
    private final EventDebounce<BlockPistonRetractKey> pistonRetractDebounce = EventDebounce.create(5000);
    private final EventDebounce<BlockPistonExtendKey> pistonExtendDebounce = EventDebounce.create(5000);

+    private static final boolean HAS_SNAPSHOT_INVHOLDER;
+    static {
+        boolean temp;
+        try {
+            Inventory.class.getMethod("getHolder", boolean.class);
+            temp = true;
+        } catch (NoSuchMethodException e) {
+            temp = false;
+        }
+        HAS_SNAPSHOT_INVHOLDER = temp;
+    }
    /**
     * Construct the listener.
     *
@@ -270,14 +286,24 @@ public class EventAbstractionListener extends AbstractListener {
            boolean trample = fromType == Material.FARMLAND && toType == Material.DIRT;
            BreakBlockEvent breakDelagate = new BreakBlockEvent(event, cause, block);
            if (trample) {
+                breakDelagate.setSilent(true);
                breakDelagate.getRelevantFlags().add(Flags.TRAMPLE_BLOCKS);
+            } else if (fromType == Material.REDSTONE_ORE) {
+                breakDelagate.setSilent(true);
            }
-            if (!Events.fireToCancel(event, breakDelagate)) {
+            boolean denied;
+            if (!(denied = Events.fireToCancel(event, breakDelagate))) {
                PlaceBlockEvent placeDelegate = new PlaceBlockEvent(event, cause, block.getLocation(), toType);
                if (trample) {
+                    placeDelegate.setSilent(true);
                    placeDelegate.getRelevantFlags().add(Flags.TRAMPLE_BLOCKS);
+                } else if (fromType == Material.REDSTONE_ORE) {
+                    placeDelegate.setSilent(true);
                }
-                Events.fireToCancel(event, placeDelegate);
+                denied = Events.fireToCancel(event, placeDelegate);
+            }
+            if (denied && entity instanceof Player) {
+                playDenyEffect((Player) entity, block.getLocation());
            }
        } else {
            if (toType == Material.AIR) {
@@ -296,16 +322,19 @@ public class EventAbstractionListener extends AbstractListener {

                Events.fireToCancel(event, new PlaceBlockEvent(event, cause, block.getLocation(), toType));

-                if (event.isCancelled() && !wasCancelled && entity instanceof FallingBlock) {
-                    FallingBlock fallingBlock = (FallingBlock) entity;
-                    final Material material = fallingBlock.getBlockData().getMaterial();
-                    if (!material.isItem()) return;
-                    ItemStack itemStack = new ItemStack(material, 1);
-                    Item item = block.getWorld().dropItem(fallingBlock.getLocation(), itemStack);
-                    item.setVelocity(new Vector());
-                    if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(block, entity), item))) {
-                        item.remove();
+                if (entity instanceof FallingBlock) {
+                    if (event.isCancelled() && !wasCancelled) {
+                        FallingBlock fallingBlock = (FallingBlock) entity;
+                        final Material material = fallingBlock.getBlockData().getMaterial();
+                        if (!material.isItem()) return;
+                        ItemStack itemStack = new ItemStack(material, 1);
+                        Item item = block.getWorld().dropItem(fallingBlock.getLocation(), itemStack);
+                        item.setVelocity(new Vector());
+                        if (Events.fireAndTestCancel(new SpawnEntityEvent(event, create(block, entity), item))) {
+                            item.remove();
+                        }
                    }
+                    Cause.untrackParentCause(entity);
                }
            }
        }
@@ -315,6 +344,9 @@ public class EventAbstractionListener extends AbstractListener {
    public void onEntityExplode(EntityExplodeEvent event) {
        Entity entity = event.getEntity();
        Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, create(entity), event.getLocation().getWorld(), event.blockList(), Material.AIR));
+        if (entity instanceof Creeper) {
+            Cause.untrackParentCause(entity);
+        }
    }

    @EventHandler(ignoreCancelled = true)
@@ -332,6 +364,7 @@ public class EventAbstractionListener extends AbstractListener {
                Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, cause, event.getBlock().getWorld(), blocks, Material.AIR));
                if (originalSize != blocks.size()) {
                    event.setCancelled(true);
+                    return;
                }
                for (Block b : blocks) {
                    Location loc = b.getRelative(direction).getLocation();
@@ -351,8 +384,14 @@ public class EventAbstractionListener extends AbstractListener {
    public void onBlockPistonExtend(BlockPistonExtendEvent event) {
        EventDebounce.Entry entry = pistonExtendDebounce.getIfNotPresent(new BlockPistonExtendKey(event), event);
        if (entry != null) {
+            Cause cause = create(event.getBlock());
            List<Block> blocks = new ArrayList<>(event.getBlocks());
            int originalLength = blocks.size();
+            Events.fireBulkEventToCancel(event, new BreakBlockEvent(event, cause, event.getBlock().getWorld(), blocks, Material.AIR));
+            if (originalLength != blocks.size()) {
+                event.setCancelled(true);
+                return;
+            }
            BlockFace dir = event.getDirection();
            for (int i = 0; i < blocks.size(); i++) {
                Block existing = blocks.get(i);
@@ -362,7 +401,7 @@ public class EventAbstractionListener extends AbstractListener {
                    blocks.set(i, existing.getRelative(dir));
                }
            }
-            Events.fireBulkEventToCancel(event, new PlaceBlockEvent(event, create(event.getBlock()), event.getBlock().getWorld(), blocks, Material.STONE));
+            Events.fireBulkEventToCancel(event, new PlaceBlockEvent(event, cause, event.getBlock().getWorld(), blocks, Material.STONE));
            if (blocks.size() != originalLength) {
                event.setCancelled(true);
            }
@@ -395,23 +434,37 @@ public class EventAbstractionListener extends AbstractListener {
        @Nullable ItemStack item = event.getItem();
        Block clicked = event.getClickedBlock();
        Block placed;
-        boolean silent = false;
        boolean modifiesWorld;
        Cause cause = create(player);

        switch (event.getAction()) {
            case PHYSICAL:
                if (event.useInteractedBlock() != Result.DENY) {
+                    if (clicked.getType() == Material.FARMLAND || clicked.getType() == Material.TURTLE_EGG) {
+                        BreakBlockEvent breakDelagate = new BreakBlockEvent(event, cause, clicked);
+                        breakDelagate.setSilent(true);
+                        breakDelagate.getRelevantFlags().add(Flags.TRAMPLE_BLOCKS);
+                        boolean denied;
+                        if (!(denied = Events.fireToCancel(event, breakDelagate))) {
+                            PlaceBlockEvent placeDelegate = new PlaceBlockEvent(event, cause, clicked.getLocation(),
+                                    clicked.getType() == Material.FARMLAND ? Material.DIRT : clicked.getType());
+                            placeDelegate.setSilent(true);
+                            placeDelegate.getRelevantFlags().add(Flags.TRAMPLE_BLOCKS);
+                            denied = Events.fireToCancel(event, placeDelegate);
+                        }
+                        if (denied) {
+                            playDenyEffect(player, clicked.getLocation());
+                        }
+                        return;
+                    }
                    DelegateEvent firedEvent = new UseBlockEvent(event, cause, clicked).setAllowed(hasInteractBypass(clicked));
                    if (clicked.getType() == Material.REDSTONE_ORE) {
-                        silent = true;
+                        firedEvent.setSilent(true);
                    }
-                    if (clicked.getType() == Material.FARMLAND || clicked.getType() == Material.TURTLE_EGG) {
-                        silent = true;
-                        firedEvent.getRelevantFlags().add(Flags.TRAMPLE_BLOCKS);
-                    }
-                    firedEvent.setSilent(silent);
                    interactDebounce.debounce(clicked, event.getPlayer(), event, firedEvent);
+                    if (event.useInteractedBlock() == Result.DENY) {
+                        playDenyEffect(player, clicked.getLocation().add(0, 1, 0));
+                    }
                }
                break;

@@ -793,7 +846,11 @@ public class EventAbstractionListener extends AbstractListener {
            } else if (damager instanceof Creeper) {
                eventToFire.getRelevantFlags().add(Flags.CREEPER_EXPLOSION);
            }
-            Events.fireToCancel(event, eventToFire);
+            if (Events.fireToCancel(event, eventToFire)) {
+                if (damager instanceof Tameable && damager instanceof Mob) {
+                    ((Mob) damager).setTarget(null);
+                }
+            }

            // Item use event with the item in hand
            // Older blacklist handler code used this, although it suffers from
@@ -874,21 +931,35 @@ public class EventAbstractionListener extends AbstractListener {

    @EventHandler(ignoreCancelled = true)
    public void onInventoryMoveItem(InventoryMoveItemEvent event) {
-        final InventoryHolder causeHolder = event.getInitiator().getHolder();
+        InventoryHolder causeHolder;
+        if (HAS_SNAPSHOT_INVHOLDER) {
+            causeHolder = event.getInitiator().getHolder(false);
+        } else {
+            causeHolder = event.getInitiator().getHolder();
+        }

+        WorldConfiguration wcfg = null;
        if (causeHolder instanceof Hopper
-                && getWorldConfig(BukkitAdapter.adapt((((Hopper) causeHolder).getWorld()))).ignoreHopperMoveEvents) {
+                && (wcfg = getWorldConfig(BukkitAdapter.adapt((((Hopper) causeHolder).getWorld())))).ignoreHopperMoveEvents) {
            return;
        } else if (causeHolder instanceof HopperMinecart
-                && getWorldConfig(BukkitAdapter.adapt((((HopperMinecart) causeHolder).getWorld()))).ignoreHopperMoveEvents) {
+                && (wcfg = getWorldConfig(BukkitAdapter.adapt((((HopperMinecart) causeHolder).getWorld())))).ignoreHopperMoveEvents) {
            return;
        }

        Entry entry;

        if ((entry = moveItemDebounce.tryDebounce(event)) != null) {
-            InventoryHolder sourceHolder = event.getSource().getHolder();
-            InventoryHolder targetHolder = event.getDestination().getHolder();
+            InventoryHolder sourceHolder;
+            InventoryHolder targetHolder;
+            if (HAS_SNAPSHOT_INVHOLDER) {
+                sourceHolder = event.getSource().getHolder(false);
+                targetHolder = event.getDestination().getHolder(false);
+            } else {
+                sourceHolder = event.getSource().getHolder();
+                targetHolder = event.getDestination().getHolder();
+            }
+
            Cause cause;

            if (causeHolder instanceof Entity) {
@@ -905,7 +976,7 @@ public class EventAbstractionListener extends AbstractListener {

            handleInventoryHolderUse(event, cause, targetHolder);

-            if (event.isCancelled() && causeHolder instanceof Hopper) {
+            if (event.isCancelled() && causeHolder instanceof Hopper && wcfg.breakDeniedHoppers) {
                Bukkit.getScheduler().scheduleSyncDelayedTask(getPlugin(),
                        () -> ((Hopper) causeHolder).getBlock().breakNaturally());
            } else {
@@ -952,15 +1023,18 @@ public class EventAbstractionListener extends AbstractListener {

    @EventHandler(ignoreCancelled = true)
    public void onBlockDispense(BlockDispenseEvent event) {
-        Cause cause = create(event.getBlock());
        Block dispenserBlock = event.getBlock();
-        ItemStack item = event.getItem();
-
-        Events.fireToCancel(event, new UseItemEvent(event, cause, dispenserBlock.getWorld(), item));

        // Simulate right click event as players have it
-        if (dispenserBlock.getBlockData() instanceof Dispenser) {
-            Dispenser dispenser = (Dispenser) dispenserBlock.getBlockData();
+        if (dispenserBlock.getType() == Material.DISPENSER) {
+            Cause cause = create(event.getBlock());
+            ItemStack item = event.getItem();
+            if (Events.fireToCancel(event, new UseItemEvent(event, cause, dispenserBlock.getWorld(), item))) {
+                return;
+            }
+
+            BlockData blockData = dispenserBlock.getBlockData();
+            Dispenser dispenser = (Dispenser) blockData; // if this ClassCastExceptions it's a bukkit bug
            Block placed = dispenserBlock.getRelative(dispenser.getFacing());
            Block clicked = placed.getRelative(dispenser.getFacing());
            handleBlockRightClick(event, cause, item, clicked, placed);
@@ -1014,6 +1088,14 @@ public class EventAbstractionListener extends AbstractListener {
        Events.fireToCancel(event, useEvent);
    }

+    @EventHandler(ignoreCancelled = true)
+    public void onCauldronLevelChange(CauldronLevelChangeEvent event) {
+        if (event.getEntity() == null) return;
+        interactDebounce.debounce(event.getBlock(), event.getEntity(), event,
+                new UseBlockEvent(event, create(event.getEntity()),
+                        event.getBlock()).setAllowed(hasInteractBypass(event.getBlock())));
+    }
+
    /**
     * Handle the right click of a block while an item is held.
     *
@@ -35,6 +35,7 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.plugin.PluginManager;
@@ -77,6 +78,14 @@ public class PlayerMoveListener implements Listener {

    @EventHandler(priority = EventPriority.HIGH)
    public void onPlayerMove(PlayerMoveEvent event) {
+        Location from = event.getFrom();
+        Location to = event.getTo();
+        if (from.getBlockX() == to.getBlockX()
+                && from.getBlockY() == to.getBlockY()
+                && from.getBlockZ() == to.getBlockZ()) {
+            return;
+        }
+
        final Player player = event.getPlayer();
        LocalPlayer localPlayer = plugin.wrapPlayer(player);

@@ -89,15 +98,15 @@ public class PlayerMoveListener implements Listener {
        } else if (event.getPlayer().getVehicle() != null && event.getPlayer().getVehicle() instanceof Horse) {
            moveType = MoveType.RIDE;
        }
-        com.sk89q.worldedit.util.Location weLocation = session.testMoveTo(localPlayer, BukkitAdapter.adapt(event.getTo()), moveType);
+        com.sk89q.worldedit.util.Location weLocation = session.testMoveTo(localPlayer, BukkitAdapter.adapt(to), moveType);

        if (weLocation != null) {
            final Location override = BukkitAdapter.adapt(weLocation);
            override.setX(override.getBlockX() + 0.5);
            override.setY(override.getBlockY());
            override.setZ(override.getBlockZ() + 0.5);
-            override.setPitch(event.getTo().getPitch());
-            override.setYaw(event.getTo().getYaw());
+            override.setPitch(to.getPitch());
+            override.setYaw(to.getYaw());

            event.setTo(override.clone());

@@ -124,4 +133,16 @@ public class PlayerMoveListener implements Listener {
        }
    }

+    @EventHandler
+    public void onPlayerQuit(PlayerQuitEvent event) {
+        final Player player = event.getPlayer();
+        LocalPlayer localPlayer = plugin.wrapPlayer(player);
+
+        Session session = WorldGuard.getInstance().getPlatform().getSessionManager().get(localPlayer);
+        com.sk89q.worldedit.util.Location loc = session.testMoveTo(localPlayer,
+            BukkitAdapter.adapt(event.getPlayer().getLocation()), MoveType.OTHER_CANCELLABLE); // white lie
+        if (loc != null) {
+            player.teleport(BukkitAdapter.adapt(loc));
+        }
+    }
 }
@@ -41,7 +41,6 @@ import com.sk89q.worldguard.bukkit.util.InteropUtils;
 import com.sk89q.worldguard.bukkit.util.Materials;
 import com.sk89q.worldguard.commands.CommandUtils;
 import com.sk89q.worldguard.config.WorldConfiguration;
-import com.sk89q.worldguard.internal.permission.RegionPermissionModel;
 import com.sk89q.worldguard.protection.association.RegionAssociable;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.StateFlag;
@@ -259,7 +258,7 @@ public class RegionProtectionListener extends AbstractListener {

            /* Inventory */
            } else if (Materials.isInventoryBlock(type)) {
-                canUse = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.INTERACT, Flags.CHEST_ACCESS));
+                canUse = query.testBuild(BukkitAdapter.adapt(target), associable, combine(event, Flags.CHEST_ACCESS));
                what = "open that";

            /* Beds */
@@ -34,6 +34,7 @@ import com.sk89q.worldguard.util.SpongeUtil;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.Block;
+import org.bukkit.block.data.Waterlogged;
 import org.bukkit.entity.Player;
 import org.bukkit.entity.Snowman;
 import org.bukkit.event.EventHandler;
@@ -194,7 +195,7 @@ public class WorldGuardBlockListener implements Listener {
            }
        }

-        if (wcfg.highFreqFlags && isWater
+        if (wcfg.highFreqFlags && (isWater || blockFrom.getBlockData() instanceof Waterlogged)
                && WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().queryState(BukkitAdapter.adapt(blockFrom.getLocation()), (RegionAssociable) null, Flags.WATER_FLOW) == StateFlag.State.DENY) {
            event.setCancelled(true);
            return;
@@ -205,13 +206,6 @@ public class WorldGuardBlockListener implements Listener {
            event.setCancelled(true);
            return;
        }
-
-        if (wcfg.disableObsidianGenerators && (isAir || isLava)
-                && (blockTo.getType() == Material.REDSTONE_WIRE
-                    || blockTo.getType() == Material.TRIPWIRE)) {
-            blockTo.setType(Material.AIR);
-            return;
-        }
    }

    /*
@@ -682,6 +676,16 @@ public class WorldGuardBlockListener implements Listener {
                event.setCancelled(true);
                return;
            }
+        } else if (Materials.isCoral(event.getBlock().getType())) {
+            if (wcfg.disableCoralBlockFade) {
+                event.setCancelled(true);
+                return;
+            }
+            if (wcfg.useRegions && !StateFlag.test(WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery()
+                    .queryState(BukkitAdapter.adapt(event.getBlock().getLocation()), (RegionAssociable) null, Flags.CORAL_FADE))) {
+                event.setCancelled(true);
+                return;
+            }
        }
    }

@@ -47,7 +47,9 @@ import org.bukkit.entity.EnderDragon;
 import org.bukkit.entity.Enderman;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
+import org.bukkit.entity.FallingBlock;
 import org.bukkit.entity.Fireball;
+import org.bukkit.entity.HumanEntity;
 import org.bukkit.entity.ItemFrame;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
@@ -74,8 +76,10 @@ import org.bukkit.event.entity.EntityDeathEvent;
 import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.entity.EntityInteractEvent;
 import org.bukkit.event.entity.EntityRegainHealthEvent;
+import org.bukkit.event.entity.EntityRegainHealthEvent.RegainReason;
 import org.bukkit.event.entity.EntityTransformEvent;
 import org.bukkit.event.entity.ExplosionPrimeEvent;
+import org.bukkit.event.entity.FoodLevelChangeEvent;
 import org.bukkit.event.entity.PigZapEvent;
 import org.bukkit.event.entity.PlayerDeathEvent;
 import org.bukkit.event.world.PortalCreateEvent;
@@ -748,6 +752,10 @@ public class WorldGuardEntityListener implements Listener {

    @EventHandler(priority = EventPriority.HIGH, ignoreCancelled = true)
    public void onEntityRegainHealth(EntityRegainHealthEvent event) {
+        RegainReason regainReason = event.getRegainReason();
+        if (regainReason != RegainReason.REGEN && regainReason != RegainReason.SATIATED) {
+            return;
+        }

        Entity ent = event.getEntity();
        World world = ent.getWorld();
@@ -759,6 +767,31 @@ public class WorldGuardEntityListener implements Listener {
            event.setCancelled(true);
            return;
        }
+        if (wcfg.useRegions && ent instanceof Player
+                && !WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().testState(
+                        BukkitAdapter.adapt(ent.getLocation()),
+                        WorldGuardPlugin.inst().wrapPlayer((Player) ent),
+                        Flags.HEALTH_REGEN)) {
+            event.setCancelled(true);
+        }
+    }
+
+    @EventHandler(ignoreCancelled = true)
+    public void onFoodChange(FoodLevelChangeEvent event) {
+        if (event.getItem() != null) return;
+        HumanEntity ent = event.getEntity();
+        if (!(ent instanceof Player)) return;
+        LocalPlayer player = WorldGuardPlugin.inst().wrapPlayer((Player) ent);
+        if (event.getFoodLevel() > player.getFoodLevel()) return;
+
+        ConfigurationManager cfg = WorldGuard.getInstance().getPlatform().getGlobalStateManager();
+        WorldConfiguration wcfg = cfg.get(player.getWorld());
+
+        if (wcfg.useRegions
+                && !WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery().testState(
+                        player.getLocation(), player, Flags.HUNGER_DRAIN)) {
+            event.setCancelled(true);
+        }
    }

    /**
@@ -774,7 +807,19 @@ public class WorldGuardEntityListener implements Listener {

        ConfigurationManager cfg = WorldGuard.getInstance().getPlatform().getGlobalStateManager();
        WorldConfiguration wcfg = cfg.get(BukkitAdapter.adapt(ent.getWorld()));
-        if (ent instanceof Enderman) {
+        if (ent instanceof FallingBlock) {
+            Material id = event.getBlock().getType();
+
+            if (id == Material.GRAVEL && wcfg.noPhysicsGravel) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (id == Material.SAND && wcfg.noPhysicsSand) {
+                event.setCancelled(true);
+                return;
+            }
+        } else if (ent instanceof Enderman) {
            if (wcfg.disableEndermanGriefing) {
                event.setCancelled(true);
                return;
@@ -38,6 +38,7 @@ import com.sk89q.worldguard.session.Session;
 import com.sk89q.worldguard.session.handler.GameModeFlag;
 import com.sk89q.worldguard.util.Entities;
 import com.sk89q.worldguard.util.command.CommandFilter;
+import com.sk89q.worldguard.util.profile.Profile;
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
@@ -147,6 +148,8 @@ public class WorldGuardPlayerListener implements Listener {
        }

        Events.fire(new ProcessPlayerEvent(player));
+        WorldGuard.getInstance().getExecutorService().submit(() ->
+            WorldGuard.getInstance().getProfileCache().put(new Profile(player.getUniqueId(), player.getName())));
    }

    @EventHandler(ignoreCancelled = true)
@@ -199,7 +202,8 @@ public class WorldGuardPlayerListener implements Listener {
            }

            if (!hostname.equals(hostKey)
-                    && !(cfg.hostKeysAllowFMLClients && hostname.equals(hostKey + "\u0000FML\u0000"))) {
+                    && !(cfg.hostKeysAllowFMLClients &&
+                            (hostname.equals(hostKey + "\u0000FML\u0000") || hostname.equals(hostKey + "\u0000FML2\u0000")))) {
                event.disallow(PlayerLoginEvent.Result.KICK_OTHER,
                        "You did not join with the valid host key!");
                log.warning("WorldGuard host key check: " +
@@ -27,7 +27,6 @@ import com.sk89q.worldguard.bukkit.WorldGuardPlugin;
 import com.sk89q.worldguard.bukkit.event.player.ProcessPlayerEvent;
 import com.sk89q.worldguard.session.AbstractSessionManager;
 import com.sk89q.worldguard.session.Session;
-import com.sk89q.worldguard.util.profile.Profile;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -62,8 +61,6 @@ public class BukkitSessionManager extends AbstractSessionManager implements Runn
        // Pre-load a session
        LocalPlayer player = WorldGuardPlugin.inst().wrapPlayer(event.getPlayer());
        get(player).initialize(player);
-        WorldGuard.getInstance().getExecutorService().submit(() ->
-            WorldGuard.getInstance().getProfileCache().put(new Profile(player.getUniqueId(), player.getName())));
    }

    @Override
@@ -454,9 +454,9 @@ public final class Materials {
        MATERIAL_FLAGS.put(Material.STONECUTTER, 0);
        MATERIAL_FLAGS.put(Material.SWEET_BERRY_BUSH, MODIFIED_ON_RIGHT);

-        MATERIAL_FLAGS.put(Material.IRON_SHOVEL, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.IRON_SHOVEL, 0);
        MATERIAL_FLAGS.put(Material.IRON_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.IRON_AXE, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.IRON_AXE, 0);
        MATERIAL_FLAGS.put(Material.FLINT_AND_STEEL, 0);
        MATERIAL_FLAGS.put(Material.APPLE, 0);
        MATERIAL_FLAGS.put(Material.BOW, 0);
@@ -467,32 +467,32 @@ public final class Materials {
        MATERIAL_FLAGS.put(Material.GOLD_INGOT, 0);
        MATERIAL_FLAGS.put(Material.IRON_SWORD, 0);
        MATERIAL_FLAGS.put(Material.WOODEN_SWORD, 0);
-        MATERIAL_FLAGS.put(Material.WOODEN_SHOVEL, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.WOODEN_SHOVEL, 0);
        MATERIAL_FLAGS.put(Material.WOODEN_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.WOODEN_AXE, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.WOODEN_AXE, 0);
        MATERIAL_FLAGS.put(Material.STONE_SWORD, 0);
-        MATERIAL_FLAGS.put(Material.STONE_SHOVEL, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.STONE_SHOVEL, 0);
        MATERIAL_FLAGS.put(Material.STONE_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.STONE_AXE, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.STONE_AXE, 0);
        MATERIAL_FLAGS.put(Material.DIAMOND_SWORD, 0);
-        MATERIAL_FLAGS.put(Material.DIAMOND_SHOVEL, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.DIAMOND_SHOVEL, 0);
        MATERIAL_FLAGS.put(Material.DIAMOND_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.DIAMOND_AXE, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.DIAMOND_AXE, 0);
        MATERIAL_FLAGS.put(Material.STICK, 0);
        MATERIAL_FLAGS.put(Material.BOWL, 0);
        MATERIAL_FLAGS.put(Material.MUSHROOM_STEW, 0);
        MATERIAL_FLAGS.put(Material.GOLDEN_SWORD, 0);
-        MATERIAL_FLAGS.put(Material.GOLDEN_SHOVEL, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.GOLDEN_SHOVEL, 0);
        MATERIAL_FLAGS.put(Material.GOLDEN_PICKAXE, 0);
-        MATERIAL_FLAGS.put(Material.GOLDEN_AXE, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.GOLDEN_AXE, 0);
        MATERIAL_FLAGS.put(Material.STRING, 0);
        MATERIAL_FLAGS.put(Material.FEATHER, 0);
        MATERIAL_FLAGS.put(Material.GUNPOWDER, 0);
-        MATERIAL_FLAGS.put(Material.WOODEN_HOE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.STONE_HOE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.IRON_HOE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.DIAMOND_HOE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.GOLDEN_HOE, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.WOODEN_HOE, 0);
+        MATERIAL_FLAGS.put(Material.STONE_HOE, 0);
+        MATERIAL_FLAGS.put(Material.IRON_HOE, 0);
+        MATERIAL_FLAGS.put(Material.DIAMOND_HOE, 0);
+        MATERIAL_FLAGS.put(Material.GOLDEN_HOE, 0);
        MATERIAL_FLAGS.put(Material.WHEAT_SEEDS, 0);
        MATERIAL_FLAGS.put(Material.BREAD, 0);
        MATERIAL_FLAGS.put(Material.LEATHER_HELMET, 0);
@@ -547,29 +547,29 @@ public final class Materials {
        MATERIAL_FLAGS.put(Material.COD, 0);
        MATERIAL_FLAGS.put(Material.COOKED_COD, 0);
        MATERIAL_FLAGS.put(Material.INK_SAC, 0);
-        MATERIAL_FLAGS.put(Material.BLACK_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.BLUE_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.BROWN_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.CYAN_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.GRAY_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.GREEN_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.LIGHT_BLUE_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.LIGHT_GRAY_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.LIME_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.MAGENTA_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.ORANGE_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.PINK_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.PURPLE_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.RED_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.WHITE_DYE, MODIFIES_BLOCKS);
-        MATERIAL_FLAGS.put(Material.YELLOW_DYE, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.BLACK_DYE, 0);
+        MATERIAL_FLAGS.put(Material.BLUE_DYE, 0);
+        MATERIAL_FLAGS.put(Material.BROWN_DYE, 0);
+        MATERIAL_FLAGS.put(Material.CYAN_DYE, 0);
+        MATERIAL_FLAGS.put(Material.GRAY_DYE, 0);
+        MATERIAL_FLAGS.put(Material.GREEN_DYE, 0);
+        MATERIAL_FLAGS.put(Material.LIGHT_BLUE_DYE, 0);
+        MATERIAL_FLAGS.put(Material.LIGHT_GRAY_DYE, 0);
+        MATERIAL_FLAGS.put(Material.LIME_DYE, 0);
+        MATERIAL_FLAGS.put(Material.MAGENTA_DYE, 0);
+        MATERIAL_FLAGS.put(Material.ORANGE_DYE, 0);
+        MATERIAL_FLAGS.put(Material.PINK_DYE, 0);
+        MATERIAL_FLAGS.put(Material.PURPLE_DYE, 0);
+        MATERIAL_FLAGS.put(Material.RED_DYE, 0);
+        MATERIAL_FLAGS.put(Material.WHITE_DYE, 0);
+        MATERIAL_FLAGS.put(Material.YELLOW_DYE, 0);
        MATERIAL_FLAGS.put(Material.COCOA_BEANS, 0);
        MATERIAL_FLAGS.put(Material.BONE_MEAL, MODIFIES_BLOCKS);
        MATERIAL_FLAGS.put(Material.BONE, 0);
        MATERIAL_FLAGS.put(Material.SUGAR, 0);
        MATERIAL_FLAGS.put(Material.COOKIE, 0);
        MATERIAL_FLAGS.put(Material.MAP, 0);
-        MATERIAL_FLAGS.put(Material.SHEARS, MODIFIES_BLOCKS);
+        MATERIAL_FLAGS.put(Material.SHEARS, 0);
        MATERIAL_FLAGS.put(Material.MELON_SLICE, 0);
        MATERIAL_FLAGS.put(Material.PUMPKIN_SEEDS, 0);
        MATERIAL_FLAGS.put(Material.MELON_SEEDS, 0);
@@ -1199,6 +1199,13 @@ public final class Materials {
        return Tag.BEDS.isTagged(material);
    }

+    public static boolean isCoral(Material material) {
+        return Tag.CORAL_BLOCKS.isTagged(material) ||
+                Tag.CORAL_PLANTS.isTagged(material) ||
+                Tag.CORALS.isTagged(material) ||
+                Tag.WALL_CORALS.isTagged(material);
+    }
+
    /**
     * Test whether the material is a crop.
     * @param type the material
@@ -1292,7 +1299,7 @@ public final class Materials {
     */
    public static boolean isItemAppliedToBlock(Material item, Material block) {
        Integer flags = MATERIAL_FLAGS.get(item);
-        return flags == null || (flags & MODIFIES_BLOCKS) == MODIFIES_BLOCKS;
+        return flags == null || (flags & MODIFIES_BLOCKS) == MODIFIES_BLOCKS || isToolApplicable(item, block);
    }

    /**
@@ -1364,4 +1371,90 @@ public final class Materials {
        }
    }

+    /**
+     * Check if the material is usable via right-click on the target
+     * material. Returns false if the target material cannot be modified
+     * by the provided tool, or of the provided tool material isn't
+     * a tool material.
+     *
+     * @param toolMaterial the tool material being used
+     * @param targetMaterial the target material to check
+     * @return true if tool has an interact function with this material
+     */
+    public static boolean isToolApplicable(Material toolMaterial, Material targetMaterial) {
+        switch (toolMaterial) {
+            case WOODEN_HOE:
+            case STONE_HOE:
+            case IRON_HOE:
+            case GOLDEN_HOE:
+            case DIAMOND_HOE:
+                switch (targetMaterial) {
+                    case GRASS_BLOCK:
+                    case DIRT:
+                    case GRASS_PATH:
+                    // case COARSE_DIRT: // already handled by the server...
+                        return true;
+                }
+                return false;
+            case WOODEN_AXE:
+            case STONE_AXE:
+            case IRON_AXE:
+            case GOLDEN_AXE:
+            case DIAMOND_AXE:
+                switch (targetMaterial) {
+                    case OAK_LOG:
+                    case DARK_OAK_LOG:
+                    case ACACIA_LOG:
+                    case BIRCH_LOG:
+                    case SPRUCE_LOG:
+                    case JUNGLE_LOG:
+                    case OAK_WOOD:
+                    case DARK_OAK_WOOD:
+                    case ACACIA_WOOD:
+                    case BIRCH_WOOD:
+                    case SPRUCE_WOOD:
+                    case JUNGLE_WOOD:
+                        return true;
+                }
+                return false;
+            case WOODEN_SHOVEL:
+            case STONE_SHOVEL:
+            case IRON_SHOVEL:
+            case GOLDEN_SHOVEL:
+            case DIAMOND_SHOVEL:
+                switch (targetMaterial) {
+                    case GRASS_BLOCK:
+                    case CAMPFIRE:
+                        return true;
+                }
+                return false;
+            case SHEARS:
+                switch (targetMaterial) {
+                    case PUMPKIN:
+                    case BEE_NEST:
+                    case BEEHIVE:
+                        return true;
+                }
+                return false;
+            case BLACK_DYE:
+            case BLUE_DYE:
+            case BROWN_DYE:
+            case CYAN_DYE:
+            case GRAY_DYE:
+            case GREEN_DYE:
+            case LIGHT_BLUE_DYE:
+            case LIGHT_GRAY_DYE:
+            case LIME_DYE:
+            case MAGENTA_DYE:
+            case ORANGE_DYE:
+            case PINK_DYE:
+            case PURPLE_DYE:
+            case RED_DYE:
+            case WHITE_DYE:
+            case YELLOW_DYE:
+                return Tag.SIGNS.isTagged(targetMaterial);
+            default:
+                return false;
+        }
+    }
 }
@@ -75,7 +75,7 @@ class FlagHelperBox extends PaginationBox {
            .collect(Collectors.toList());
    private static final int SIZE = FLAGS.size() == Flags.INBUILT_FLAGS.size() ? FLAGS.size() : FLAGS.size() + 1;
    private static final int PAD_PX_SIZE = 180;
-    private static final Set<Flag<?>> DANGER_ZONE = ImmutableSet.of(Flags.BUILD, Flags.PASSTHROUGH, Flags.BLOCK_PLACE, Flags.BLOCK_BREAK);
+    static final Set<Flag<?>> DANGER_ZONE = ImmutableSet.of(Flags.BUILD, Flags.PASSTHROUGH, Flags.BLOCK_PLACE, Flags.BLOCK_BREAK);

    private final World world;
    private final ProtectedRegion region;
@@ -199,7 +199,7 @@ class FlagHelperBox extends PaginationBox {
            if (maySet) {
                if (isExplicitSet) {
                    hoverTexts.add(TextComponent.of("Click to unset", TextColor.GOLD));
-                } else if (DANGER_ZONE.contains(flag)) {
+                } else if (DANGER_ZONE.contains(flag) && !(ProtectedRegion.GLOBAL_REGION.equals(region.getId()) && flag == Flags.PASSTHROUGH)) {
                    hoverTexts.add(TextComponent.of("Setting this flag may have unintended consequences.", TextColor.RED)
                            .append(TextComponent.newline())
                            .append(TextComponent.of("Please read the documentation and set this flag manually if you really intend to.")
@@ -129,22 +129,21 @@ public final class RegionCommands extends RegionCommandsBase {
     * @throws CommandException any error
     */
    @Command(aliases = {"define", "def", "d", "create"},
-             usage = "<id> [<owner1> [<owner2> [<owners...>]]]",
-             flags = "ng",
+             usage = "[-w <world>] <id> [<owner1> [<owner2> [<owners...>]]]",
+             flags = "ngw:",
             desc = "Defines a region",
             min = 1)
    public void define(CommandContext args, Actor sender) throws CommandException {
        warnAboutSaveFailures(sender);
-        LocalPlayer player = worldGuard.checkPlayer(sender);

        // Check permissions
-        if (!getPermissionModel(player).mayDefine()) {
+        if (!getPermissionModel(sender).mayDefine()) {
            throw new CommandPermissionsException();
        }

        String id = checkRegionId(args.getString(0), false);

-        World world = player.getWorld();
+        World world = checkWorld(args, sender, 'w');
        RegionManager manager = checkRegionManager(world);

        checkRegionDoesNotExist(manager, id, true);
@@ -154,7 +153,7 @@ public final class RegionCommands extends RegionCommandsBase {
        if (args.hasFlag('g')) {
            region = new GlobalProtectedRegion(id);
        } else {
-            region = checkRegionFromSelection(player, id);
+            region = checkRegionFromSelection(sender, id);
        }

        RegionAdder task = new RegionAdder(manager, region);
@@ -182,24 +181,22 @@ public final class RegionCommands extends RegionCommandsBase {
     * @throws CommandException any error
     */
    @Command(aliases = {"redefine", "update", "move"},
-             usage = "<id>",
+             usage = "[-w <world>] <id>",
             desc = "Re-defines the shape of a region",
-             flags = "g",
+             flags = "gw:",
             min = 1, max = 1)
    public void redefine(CommandContext args, Actor sender) throws CommandException {
        warnAboutSaveFailures(sender);

-        LocalPlayer player = worldGuard.checkPlayer(sender);
-
        String id = checkRegionId(args.getString(0), false);

-        World world = player.getWorld();
+        World world = checkWorld(args, sender, 'w');
        RegionManager manager = checkRegionManager(world);

        ProtectedRegion existing = checkExistingRegion(manager, id, false);

        // Check permissions
-        if (!getPermissionModel(player).mayRedefine(existing)) {
+        if (!getPermissionModel(sender).mayRedefine(existing)) {
            throw new CommandPermissionsException();
        }

@@ -208,7 +205,7 @@ public final class RegionCommands extends RegionCommandsBase {
        if (args.hasFlag('g')) {
            region = new GlobalProtectedRegion(id);
        } else {
-            region = checkRegionFromSelection(player, id);
+            region = checkRegionFromSelection(sender, id);
        }

        region.copyFrom(existing);
@@ -221,9 +218,9 @@ public final class RegionCommands extends RegionCommandsBase {
                .sendMessageAfterDelay("(Please wait... " + description + ")")
                .onSuccess((Component) null,
                        t -> {
-                            player.print(String.format("Region '%s' has been updated with a new area.", region.getId()));
-                            warnAboutDimensions(player, region);
-                            informNewUser(player, manager, region);
+                            sender.print(String.format("Region '%s' has been updated with a new area.", region.getId()));
+                            warnAboutDimensions(sender, region);
+                            informNewUser(sender, manager, region);
                            checkSpawnOverlap(sender, world, region);
                        })
                .onFailure(String.format("Failed to update the region '%s'", region.getId()), worldGuard.getExceptionConverter())
@@ -338,28 +335,34 @@ public final class RegionCommands extends RegionCommandsBase {
     * @throws CommandException any error
     */
    @Command(aliases = {"select", "sel", "s"},
-             usage = "[id]",
+             usage = "[-w <world>] [id]",
             desc = "Load a region as a WorldEdit selection",
-             min = 0, max = 1)
+             min = 0, max = 1,
+             flags = "w:")
    public void select(CommandContext args, Actor sender) throws CommandException {
-        LocalPlayer player = worldGuard.checkPlayer(sender);
-        RegionManager manager = checkRegionManager(player.getWorld());
+        World world = checkWorld(args, sender, 'w');
+        RegionManager manager = checkRegionManager(world);
        ProtectedRegion existing;

        // If no arguments were given, get the region that the player is inside
        if (args.argsLength() == 0) {
-            existing = checkRegionStandingIn(manager, player, "/rg select %id%");
+            LocalPlayer player = worldGuard.checkPlayer(sender);
+            if (!player.getWorld().equals(world)) { // confusing to get current location regions in another world
+                throw new CommandException("Please specify a region name."); // just don't allow that
+            }
+            world = player.getWorld();
+            existing = checkRegionStandingIn(manager, player, "/rg select -w \"" + world.getName() + "\" %id%");
        } else {
            existing = checkExistingRegion(manager, args.getString(0), false);
        }

        // Check permissions
-        if (!getPermissionModel(player).maySelect(existing)) {
+        if (!getPermissionModel(sender).maySelect(existing)) {
            throw new CommandPermissionsException();
        }

        // Select
-        setPlayerSelection(player, existing);
+        setPlayerSelection(sender, existing, world);
    }

    /**
@@ -407,7 +410,7 @@ public final class RegionCommands extends RegionCommandsBase {
                throw new CommandPermissionsException();
            }

-            setPlayerSelection(worldGuard.checkPlayer(sender), existing);
+            setPlayerSelection(worldGuard.checkPlayer(sender), existing, world);
        }

        // Print region information
@@ -417,7 +420,10 @@ public final class RegionCommands extends RegionCommandsBase {
        AsyncCommandBuilder.wrap(printout, sender)
                .registerWithSupervisor(WorldGuard.getInstance().getSupervisor(), "Fetching region info")
                .sendMessageAfterDelay("(Please wait... fetching region information...)")
-                .onSuccess((Component) null, sender::print)
+                .onSuccess((Component) null, component -> {
+                    sender.print(component);
+                    checkSpawnOverlap(sender, world, existing);
+                })
                .onFailure("Failed to fetch region information", WorldGuard.getInstance().getExceptionConverter())
                .buildAndExec(WorldGuard.getInstance().getExecutorService());
    }
@@ -622,6 +628,7 @@ public final class RegionCommands extends RegionCommandsBase {
            printout.appendFlagsList(false);
            printout.append(SubtleFormat.wrap(")"));
            printout.send(sender);
+            checkSpawnOverlap(sender, world, existing);
        }
    }

@@ -662,7 +669,12 @@ public final class RegionCommands extends RegionCommandsBase {
        if (!sender.isPlayer()) {
            flagHelperBox.tryMonoSpacing();
        }
-        AsyncCommandBuilder.wrap(() -> flagHelperBox.create(page), sender)
+        AsyncCommandBuilder.wrap(() -> {
+                    if (checkSpawnOverlap(sender, world, region)) {
+                        flagHelperBox.setComponentsPerPage(15);
+                    }
+                    return flagHelperBox.create(page);
+                }, sender)
                .onSuccess((Component) null, sender::print)
                .onFailure("Failed to get region flags", WorldGuard.getInstance().getExceptionConverter())
                .buildAndExec(WorldGuard.getInstance().getExecutorService());
@@ -698,6 +710,7 @@ public final class RegionCommands extends RegionCommandsBase {
        existing.setPriority(priority);

        sender.print("Priority of '" + existing.getId() + "' set to " + priority + " (higher numbers override).");
+        checkSpawnOverlap(sender, world, existing);
    }

    /**
@@ -1098,8 +1111,16 @@ public final class RegionCommands extends RegionCommandsBase {
            }
        }

+        String message = existing.getFlag(Flags.TELE_MESSAGE);
+
+        // If the flag isn't set, use the default message
+        // If message.isEmpty(), no message is sent by LocalPlayer#teleport(...)
+        if (message == null) {
+            message = Flags.TELE_MESSAGE.getDefault();
+        }
+
        player.teleport(teleportLocation,
-                "Teleported you to the region '" + existing.getId() + "'.",
+                message.replace("%id%", existing.getId()),
                "Unable to teleport to region '" + existing.getId() + "'.");
    }

@@ -84,9 +84,25 @@ class RegionCommandsBase {
     * @throws CommandException on error
     */
    protected static World checkWorld(CommandContext args, Actor sender, char flag) throws CommandException {
+        return checkWorld(args, sender, flag, true);
+    }
+
+    protected static World checkWorld(CommandContext args, Actor sender, char flag, boolean allowWorldEditOverride) throws CommandException {
        if (args.hasFlag(flag)) {
            return WorldGuard.getInstance().getPlatform().getMatcher().matchWorld(sender, args.getFlag(flag));
        } else {
+            if (allowWorldEditOverride) {
+                try {
+                    World override = WorldEdit.getInstance().getSessionManager().get(sender).getWorldOverride();
+                    if (override != null) {
+                        if (sender instanceof LocalPlayer && !override.equals(((LocalPlayer) sender).getWorld())) {
+                            sender.printDebug(TextComponent.of("Using //world override for region command: " + override.getName()));
+                        }
+                        return override;
+                    }
+                } catch (NoSuchMethodError ignored) {
+                }
+            }
            if (sender instanceof LocalPlayer) {
                return ((LocalPlayer) sender).getWorld();
            } else {
@@ -219,16 +235,17 @@ class RegionCommandsBase {
    }

    /**
-     * Get a WorldEdit selection for a player, or emit an exception if there is none
+     * Get a WorldEdit selection for an actor, or emit an exception if there is none
     * available.
     *
-     * @param player the player
+     * @param actor the actor
     * @return the selection
     * @throws CommandException thrown on an error
     */
-    protected static Region checkSelection(LocalPlayer player) throws CommandException {
+    protected static Region checkSelection(Actor actor) throws CommandException {
        try {
-            return WorldEdit.getInstance().getSessionManager().get(player).getRegionSelector(player.getWorld()).getRegion();
+            LocalSession localSession = WorldEdit.getInstance().getSessionManager().get(actor);
+            return localSession.getRegionSelector(localSession.getSelectionWorld()).getRegion();
        } catch (IncompleteRegionException e) {
            throw new CommandException(
                    "Please select an area first. " +
@@ -273,15 +290,15 @@ class RegionCommandsBase {
    }

    /**
-     * Create a {@link ProtectedRegion} from the player's selection.
+     * Create a {@link ProtectedRegion} from the actor's selection.
     *
-     * @param player the player
+     * @param actor the actor
     * @param id the ID of the new region
     * @return a new region
     * @throws CommandException thrown on an error
     */
-    protected static ProtectedRegion checkRegionFromSelection(LocalPlayer player, String id) throws CommandException {
-        Region selection = checkSelection(player);
+    protected static ProtectedRegion checkRegionFromSelection(Actor actor, String id) throws CommandException {
+        Region selection = checkSelection(actor);

        // Detect the type of region from WorldEdit
        if (selection instanceof Polygonal2DRegion) {
@@ -323,6 +340,9 @@ class RegionCommandsBase {
     * @param region the region
     */
    protected static void warnAboutDimensions(Actor sender, ProtectedRegion region) {
+        if (region instanceof GlobalProtectedRegion) {
+            return;
+        }
        int height = region.getMaximumPoint().getBlockY() - region.getMinimumPoint().getBlockY();
        if (height <= 2) {
            sender.printDebug("(Warning: The height of the region was " + (height + 1) + " block(s).)");
@@ -351,26 +371,28 @@ class RegionCommandsBase {
     * @param world the world the region is in
     * @param region the region
     */
-    protected static void checkSpawnOverlap(Actor sender, World world, ProtectedRegion region) {
+    protected static boolean checkSpawnOverlap(Actor sender, World world, ProtectedRegion region) {
        ProtectedRegion spawn = WorldGuard.getInstance().getPlatform().getSpawnProtection(world);
        if (spawn != null) {
            if (!spawn.getIntersectingRegions(ImmutableList.of(region)).isEmpty()) {
                sender.print(ErrorFormat.wrap("Warning!")
                        .append(TextComponent.of(" This region overlaps vanilla's spawn protection. WorldGuard cannot " +
-                                "override this, and only server operators will be able to interact with this area.")));
+                                "override this, and only server operators will be able to interact with this area.", TextColor.WHITE)));
+                return true;
            }
        }
+        return false;
    }

    /**
-     * Set a player's selection to a given region.
+     * Set an actor's selection to a given region.
     *
-     * @param player the player
+     * @param actor the actor
     * @param region the region
     * @throws CommandException thrown on a command error
     */
-    protected static void setPlayerSelection(LocalPlayer player, ProtectedRegion region) throws CommandException {
-        LocalSession session = WorldEdit.getInstance().getSessionManager().get(player);
+    protected static void setPlayerSelection(Actor actor, ProtectedRegion region, World world) throws CommandException {
+        LocalSession session = WorldEdit.getInstance().getSessionManager().get(actor);

        // Set selection
        if (region instanceof ProtectedCuboidRegion) {
@@ -378,20 +400,20 @@ class RegionCommandsBase {
            BlockVector3 pt1 = cuboid.getMinimumPoint();
            BlockVector3 pt2 = cuboid.getMaximumPoint();

-            CuboidRegionSelector selector = new CuboidRegionSelector(player.getWorld(), pt1, pt2);
-            session.setRegionSelector(player.getWorld(), selector);
-            selector.explainRegionAdjust(player, session);
-            player.print("Region selected as a cuboid.");
+            CuboidRegionSelector selector = new CuboidRegionSelector(world, pt1, pt2);
+            session.setRegionSelector(world, selector);
+            selector.explainRegionAdjust(actor, session);
+            actor.print("Region selected as a cuboid.");

        } else if (region instanceof ProtectedPolygonalRegion) {
            ProtectedPolygonalRegion poly2d = (ProtectedPolygonalRegion) region;
            Polygonal2DRegionSelector selector = new Polygonal2DRegionSelector(
-                    player.getWorld(), poly2d.getPoints(),
+                    world, poly2d.getPoints(),
                    poly2d.getMinimumPoint().getBlockY(),
                    poly2d.getMaximumPoint().getBlockY());
-            session.setRegionSelector(player.getWorld(), selector);
-            selector.explainRegionAdjust(player, session);
-            player.print("Region selected as a polygon.");
+            session.setRegionSelector(world, selector);
+            selector.explainRegionAdjust(actor, session);
+            actor.print("Region selected as a polygon.");

        } else if (region instanceof GlobalProtectedRegion) {
            throw new CommandException(
@@ -19,6 +19,7 @@

 package com.sk89q.worldguard.commands.region;

+import com.sk89q.worldguard.protection.flags.registry.UnknownFlag;
 import com.sk89q.worldguard.util.profile.cache.ProfileCache;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.math.BlockVector3;
@@ -143,8 +144,22 @@ public class RegionPrintoutBuilder implements Callable<TextComponent> {
                flagString = flag.getName() + " -g " + group + ": ";
            }

-            TextComponent flagText = TextComponent.of(flagString, useColors ? TextColor.GOLD : TextColor.WHITE)
-                    .append(TextComponent.of(String.valueOf(val), useColors? TextColor.YELLOW : TextColor.WHITE));
+            TextColor flagColor = TextColor.WHITE;
+            if (useColors) {
+                // passthrough is ok on global
+                if (FlagHelperBox.DANGER_ZONE.contains(flag)
+                        && !(region.getId().equals(ProtectedRegion.GLOBAL_REGION) && flag == Flags.PASSTHROUGH)) {
+                    flagColor = TextColor.DARK_RED;
+                } else if (Flags.INBUILT_FLAGS.contains(flag.getName())) {
+                    flagColor = TextColor.GOLD;
+                } else if (flag instanceof UnknownFlag) {
+                    flagColor = TextColor.GRAY;
+                } else {
+                    flagColor = TextColor.LIGHT_PURPLE;
+                }
+            }
+            TextComponent flagText = TextComponent.of(flagString, flagColor)
+                    .append(TextComponent.of(String.valueOf(val), useColors ? TextColor.YELLOW : TextColor.WHITE));
            if (perms != null && perms.maySetFlag(region, flag)) {
                flagText = flagText.hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT, TextComponent.of("Click to set flag")))
                        .clickEvent(ClickEvent.of(ClickEvent.Action.SUGGEST_COMMAND,
@@ -305,7 +320,7 @@ public class RegionPrintoutBuilder implements Callable<TextComponent> {
            builder.append(TextComponent.space().append(TextComponent.of("[Teleport]", TextColor.GRAY)
                    .hoverEvent(HoverEvent.of(HoverEvent.Action.SHOW_TEXT,
                            TextComponent.of("Click to teleport").append(TextComponent.newline()).append(
-                                    TextComponent.of(teleFlag.getBlockY() + ", "
+                                    TextComponent.of(teleFlag.getBlockX() + ", "
                                            + teleFlag.getBlockY() + ", "
                                            + teleFlag.getBlockZ()))))
                    .clickEvent(ClickEvent.of(ClickEvent.Action.RUN_COMMAND,
@@ -158,16 +158,19 @@ public abstract class WorldConfiguration {
    public boolean disableEndermanGriefing;
    public boolean disableSnowmanTrails;
    public boolean disableSoilDehydration;
+    public boolean disableCoralBlockFade;
    public Set<String> allowedSnowFallOver;
    public boolean regionInvinciblityRemovesMobs;
    public boolean regionCancelEmptyChatEvents;
    public boolean regionNetherPortalProtection;
+    public boolean forceDefaultTitleTimes;
    public boolean fakePlayerBuildOverride;
    public boolean explosionFlagCancellation;
    public boolean disableDeathMessages;
    public boolean disableObsidianGenerators;
    public boolean strictEntitySpawn;
    public boolean ignoreHopperMoveEvents;
+    public boolean breakDeniedHoppers;
    protected Map<String, Integer> maxRegionCounts;

    /**
@@ -311,7 +311,7 @@ public class DefaultDomain implements Domain, ChangeTracked {
    public String toGroupsString() {
        StringBuilder str = new StringBuilder();
        for (Iterator<String> it = groupDomain.getGroups().iterator(); it.hasNext(); ) {
-            str.append("*");
+            str.append("g:");
            str.append(it.next());
            if (it.hasNext()) {
                str.append(", ");
@@ -373,7 +373,8 @@ public class DefaultDomain implements Domain, ChangeTracked {
    private Component toGroupsComponent() {
        final TextComponent.Builder builder = TextComponent.builder("");
        for (Iterator<String> it = groupDomain.getGroups().iterator(); it.hasNext(); ) {
-            builder.append(TextComponent.of(it.next(), TextColor.GOLD));
+            builder.append(TextComponent.of("g:", TextColor.GRAY))
+                    .append(TextComponent.of(it.next(), TextColor.GOLD));
            if (it.hasNext()) {
                builder.append(TextComponent.of(", "));
            }
@@ -361,7 +361,8 @@ public class FlagValueCalculator {
            if (flag == Flags.PASSTHROUGH) {
                // Has members/owners -> the global region acts like
                // a regular region without PASSTHROUGH
-                if (region.hasMembersOrOwners() || region.getFlag(Flags.PASSTHROUGH) == State.DENY) {
+                State passthrough = region.getFlag(Flags.PASSTHROUGH);
+                if (passthrough == State.DENY || passthrough != State.ALLOW && region.hasMembersOrOwners()) {
                    return null;
                } else {
                    return (V) State.ALLOW;
@@ -118,6 +118,7 @@ public final class Flags {
    public static final StateFlag VINE_GROWTH = register(new StateFlag("vine-growth", true));
    public static final StateFlag CROP_GROWTH = register(new StateFlag("crop-growth", true));
    public static final StateFlag SOIL_DRY = register(new StateFlag("soil-dry", true));
+    public static final StateFlag CORAL_FADE = register(new StateFlag("coral-fade", true));
    public static final StateFlag WATER_FLOW = register(new StateFlag("water-flow", true));
    public static final StateFlag LAVA_FLOW = register(new StateFlag("lava-flow", true));

@@ -134,9 +135,20 @@ public final class Flags {
    public static final LocationFlag TELE_LOC = register(new LocationFlag("teleport", RegionGroup.MEMBERS));
    public static final LocationFlag SPAWN_LOC = register(new LocationFlag("spawn", RegionGroup.MEMBERS));

+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
+    public static final StringFlag TELE_MESSAGE = register(new StringFlag("teleport-message",
+            LegacyComponentSerializer.INSTANCE.serialize(TextComponent.of("").append(TextComponent.of(
+                    "Teleported you to the region '%id%'.", TextColor.LIGHT_PURPLE)))));
+
    // idk?
    public static final StateFlag INVINCIBILITY = register(new StateFlag("invincible", false));
    public static final StateFlag FALL_DAMAGE = register(new StateFlag("fall-damage", true));
+    public static final StateFlag HEALTH_REGEN = register(new StateFlag("natural-health-regen", true));
+    public static final StateFlag HUNGER_DRAIN = register(new StateFlag("natural-hunger-drain", true));

    // session and movement based flags
    public static final StateFlag ENTRY = register(new StateFlag("entry", true, RegionGroup.NON_MEMBERS));
@@ -147,9 +159,29 @@ public final class Flags {
    public static final StateFlag ENDERPEARL = register(new StateFlag("enderpearl", true));
    public static final StateFlag CHORUS_TELEPORT = register(new StateFlag("chorus-fruit-teleport", true));

+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
    public static final StringFlag GREET_MESSAGE = register(new StringFlag("greeting"));
+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
    public static final StringFlag FAREWELL_MESSAGE = register(new StringFlag("farewell"));
+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
    public static final StringFlag GREET_TITLE = register(new StringFlag("greeting-title"));
+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
    public static final StringFlag FAREWELL_TITLE = register(new StringFlag("farewell-title"));

    public static final BooleanFlag NOTIFY_ENTER = register(new BooleanFlag("notify-enter"));
@@ -173,14 +205,29 @@ public final class Flags {
    public static final IntegerFlag MAX_FOOD = register(new IntegerFlag("feed-max-hunger"), f -> f.setSuggestedValues(VITALS_MAXS));

    // deny messages
+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
    public static final StringFlag DENY_MESSAGE = register(new StringFlag("deny-message",
            LegacyComponentSerializer.INSTANCE.serialize(TextComponent.of("").append(TextComponent.of("Hey!",
                    TextColor.RED, Sets.newHashSet(TextDecoration.BOLD)))
                    .append(TextComponent.of(" Sorry, but you can't %what% here.", TextColor.GRAY)))));
+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
    public static final StringFlag ENTRY_DENY_MESSAGE = register(new StringFlag("entry-deny-message",
            LegacyComponentSerializer.INSTANCE.serialize(TextComponent.of("").append(TextComponent.of("Hey!",
                    TextColor.RED, Sets.newHashSet(TextDecoration.BOLD)))
                    .append(TextComponent.of(" You are not permitted to enter this area.", TextColor.GRAY)))));
+    /**
+     * @deprecated The type of this flag will change from a StringFlag to a ComponentFlag to support JSON text
+     *              in a future release. If you depend on the type of this flag, take proper precaution for future breakage.
+     */
+    @Deprecated
    public static final StringFlag EXIT_DENY_MESSAGE = register(new StringFlag("exit-deny-message",
            LegacyComponentSerializer.INSTANCE.serialize(TextComponent.of("").append(TextComponent.of("Hey!",
                    TextColor.RED, Sets.newHashSet(TextDecoration.BOLD)))
@@ -21,6 +21,8 @@ package com.sk89q.worldguard.protection.flags;

 import static com.google.common.base.Preconditions.checkNotNull;

+import com.google.common.annotations.Beta;
+
 /**
 * Stores an Number.
 */
@@ -37,10 +39,20 @@ public abstract class NumberFlag<T extends Number> extends Flag<T> {
        super(name);
    }

+    /**
+     * Not recommended for public use. Will likely be moved when migrating to piston for commands.
+     * @param values suggested values
+     */
+    @Beta
    public void setSuggestedValues(Number[] values) {
        this.suggestions = checkNotNull(values);
    }

+    /**
+     * Not recommended for public use. Will likely be moved when migrating to piston for commands.
+     * @return suggested values
+     */
+    @Beta
    public Number[] getSuggestedValues() {
        return suggestions;
    }
@@ -59,7 +59,7 @@ public abstract class AbstractSessionManager implements SessionManager {

    private final LoadingCache<WorldPlayerTuple, Boolean> bypassCache = CacheBuilder.newBuilder()
            .maximumSize(1000)
-            .expireAfterAccess(2, TimeUnit.SECONDS)
+            .expireAfterWrite(2, TimeUnit.SECONDS)
            .build(CacheLoader.from(tuple ->
                    tuple.getPlayer().hasPermission("worldguard.region.bypass." + tuple.getWorld().getName())));

@@ -27,6 +27,7 @@ import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldguard.TestPlayer;
 import com.sk89q.worldguard.WorldGuard;
 import com.sk89q.worldguard.domains.DefaultDomain;
+import com.sk89q.worldguard.protection.association.RegionOverlapAssociation;
 import com.sk89q.worldguard.protection.flags.Flags;
 import com.sk89q.worldguard.protection.flags.StateFlag;
 import com.sk89q.worldguard.protection.flags.registry.FlagRegistry;
@@ -168,10 +169,6 @@ public abstract class RegionOverlapTest {
    public void testPlayer2BuildAccess() {
        ApplicableRegionSet appl;

-        HashSet<ProtectedRegion> test = new HashSet<>();
-        test.add(courtyard);
-        test.add(fountain);
-
        // Outside
        appl = manager.getApplicableRegions(outside);
        assertTrue(appl.testState(player2, Flags.BUILD));
@@ -182,4 +179,61 @@ public abstract class RegionOverlapTest {
        appl = manager.getApplicableRegions(inFountain);
        assertTrue(appl.testState(player2, Flags.BUILD));
    }
+
+    @Test
+    public void testNonPlayerBuildAccessInOneRegion() {
+        ApplicableRegionSet appl;
+
+        HashSet<ProtectedRegion> source = new HashSet<>();
+        source.add(courtyard);
+        RegionOverlapAssociation assoc = new RegionOverlapAssociation(source);
+
+        // Outside
+        appl = manager.getApplicableRegions(outside);
+        assertTrue(appl.testState(assoc, Flags.BUILD));
+        // Inside courtyard
+        appl = manager.getApplicableRegions(inCourtyard);
+        assertTrue(appl.testState(assoc, Flags.BUILD));
+        // Inside fountain
+        appl = manager.getApplicableRegions(inFountain);
+        assertFalse(appl.testState(assoc, Flags.BUILD));
+    }
+
+    @Test
+    public void testNonPlayerBuildAccessInBothRegions() {
+        ApplicableRegionSet appl;
+
+        HashSet<ProtectedRegion> source = new HashSet<>();
+        source.add(fountain);
+        source.add(courtyard);
+        RegionOverlapAssociation assoc = new RegionOverlapAssociation(source);
+
+        // Outside
+        appl = manager.getApplicableRegions(outside);
+        assertTrue(appl.testState(assoc, Flags.BUILD));
+        // Inside courtyard
+        appl = manager.getApplicableRegions(inCourtyard);
+        assertTrue(appl.testState(assoc, Flags.BUILD));
+        // Inside fountain
+        appl = manager.getApplicableRegions(inFountain);
+        assertTrue(appl.testState(assoc, Flags.BUILD));
+    }
+
+    @Test
+    public void testNonPlayerBuildAccessInNoRegions() {
+        ApplicableRegionSet appl;
+
+        HashSet<ProtectedRegion> source = new HashSet<>();
+        RegionOverlapAssociation assoc = new RegionOverlapAssociation(source);
+
+        // Outside
+        appl = manager.getApplicableRegions(outside);
+        assertTrue(appl.testState(assoc, Flags.BUILD));
+        // Inside courtyard
+        appl = manager.getApplicableRegions(inCourtyard);
+        assertFalse(appl.testState(assoc, Flags.BUILD));
+        // Inside fountain
+        appl = manager.getApplicableRegions(inFountain);
+        assertFalse(appl.testState(assoc, Flags.BUILD));
+    }
 }
Author	SHA1	Message	Date
wizjany	5407315799	Release 7.0.3 for MC 1.14/1.15. Last release before switching to 1.16.	2020-06-25 23:40:40 -04:00
wizjany	b769469f5b	Changelog for 7.0.3.	2020-06-25 23:11:51 -04:00
wizjany	3a9b1b1525	Add deprecation warnings to StringFlags.	2020-06-25 22:57:28 -04:00
wizjany	ff5f933879	Typo.	2020-06-24 10:42:12 -04:00
wizjany	0492fafe30	Color 3rd party flags and unregistered flags in /rg info.	2020-06-21 17:25:38 -04:00
wizjany	36d95ad090	More inventory holder snapshot use.	2020-06-21 16:57:58 -04:00
wizjany	c1ec708050	Use `Inventory#getHolder(boolean useSnapshot)` where available. Dedicated to @phoenix616	2020-06-21 16:39:28 -04:00
wizjany	f4a3e8a936	Allow setting passthrough on global via /rg flags. Closes #1584.	2020-06-11 14:57:22 -04:00
wizjany	6c5380ba0b	Prioritize tamed owners over entity targets. Fixes #1587.	2020-06-08 13:14:04 -04:00
wizjany	868089b44f	Actually read TargetMatchers from world configs. Previously only read from global.	2020-06-01 15:52:16 -04:00
wizjany	9905d22ddf	Add dyes as tools for interact handling.	2020-05-19 14:50:46 -04:00
UltraFaceguy	4eaa376e2c	Providing a solution for tools being unable to interact with usable blocks	2020-05-12 20:56:41 -04:00
JOO200	37ae70f35d	Add coral-fade flag and world configuration to disable coral fading Closes #1532	2020-05-10 03:12:20 -04:00
wizjany	1a69250d9b	Allow droppers to drop items without using them. Fixes #1570.	2020-05-10 03:12:18 -04:00
wizjany	b2d2d0815b	Silence EntityChangeBlock for redstone ore. We already silence this for Action.PHYSICAL PlayerInteractEvents. Unfortunately Bukkit throws another event at us without the extra info about interaction type, which gets fired if the interact flag is allow. So silence that too. Closes #1573.	2020-05-10 03:12:17 -04:00
wizjany	47cd96a3af	Add tests to validate behavior of non-player causes in multiple regions.	2020-05-02 10:41:51 -04:00
wizjany	0a735e0146	Don't warn about small global regions. Closes #1567.	2020-05-01 19:39:59 -04:00
stonar96	60590acfe3	Remove unnecessary checks and add comments	2020-04-29 15:15:07 -04:00
stonar96	6030bea13e	Improve default teleport-message and remove null check	2020-04-29 15:15:07 -04:00
stonar96	20f89ea2ae	Add teleport-message flag	2020-04-29 15:15:07 -04:00
wizjany	4c351fb0e3	Workaround for CraftBukkit's move event throttling.	2020-04-28 16:19:18 -04:00
wizjany	5e7829c3fe	Allow FML2 in forge host keys. Closes #1542.	2020-04-24 11:43:22 -04:00
wizjany	37e66dae7d	Track BlockProjectileSource causes.	2020-04-24 10:06:16 -04:00
wizjany	662ae2bc84	Add issue templates.	2020-04-16 09:02:01 -04:00
wizjany	fa60582afe	Sand/gravel tick now, even if physics is cancelled.	2020-04-09 18:47:01 -04:00
wizjany	17c1647163	Move profile cache updating to join event. Adding it to onEnable might back up the executor on /reloads.	2020-04-07 11:25:56 -04:00
wizjany	1fcda13469	Check waterlogged blocks for water-flow flag. Also remove some terribly outdated obsidian generator protection. Fixes #1546.	2020-03-29 20:16:50 -04:00
wizjany	570b7f7b77	Allow passthrough allow on global to override added members/owners.	2020-03-29 19:48:13 -04:00
wizjany	aca0d843f6	Allow WorldEdit's //world override to affect region commands. Priority is `-w` flag > //world override > player world > error. Also makes regions selectable from console.	2020-03-23 21:32:25 -04:00
wizjany	1172ebd419	More spawn protection warnings. Can't have enough of these apparently.	2020-03-23 16:40:12 -04:00
wizjany	a09ccc5b45	Fire block breaks for piston extends, not just places.	2020-03-21 11:25:46 -04:00
wizjany	e6bdf8abb5	Fix cauldron NPE. Closes #1541.	2020-03-19 22:34:39 -04:00
wizjany	df2ae6a666	Tweak some region info output, fix teleport location.	2020-03-19 13:34:20 -04:00
wizjany	e4481f9337	Protect cauldron level change. Closes #1262.	2020-03-12 15:26:22 -04:00
wizjany	2169aa218e	Add option to always use default MC times for sending titles. Alleviates issues with other plugins setting extremely short/long times.	2020-02-15 16:04:47 -05:00
wizjany	523e45188d	Default nether-portal-protection to true. Pre 1.14, this was false by default as one could repeatedly force portal searches by entering a portal which would lead into a protected area. Since 1.14, the event we have access too happens independently of the portal search, so the player will get teleported regardless of whether a portal is present or if the creation gets cancelled.	2020-02-15 13:31:38 -05:00
wizjany	d95c6af1be	Remove metadata when the entity is done. Apparently Bukkit doesn't actually do this. Fixes WORLDGUARD-4169.	2020-02-13 23:20:04 -05:00
wizjany	0d860bfca7	Change bypass cache to expireAfterWrite. This hasn't caused issues for the past 5 years but I guess ¯\_(ツ)_/¯	2020-02-06 18:16:55 -05:00
wizjany	6f6125fe00	Treat farmland and turtle egg PIE as EntityChangeBlock. Note that as in `d37f015f` this decouples the event from interact flag, meaning that block-trampling must be explicitly set to allow to maintain previous behavior. It also means that setting interact to allow won't by default allow players to trample turtle eggs (but this wasn't the case for farmland, since that was already handled by ECB - thanks Bukkit). Fixes WORLDGUARD-4163.	2020-02-01 11:39:20 -05:00
wizjany	0332929531	Bump bStats to 1.7, adding plugin id.	2020-01-31 11:18:50 -05:00
Wyatt Childers	637665f52d	Add a scripts folder to gitignore for dev scripts	2020-01-14 22:51:13 -05:00
wizjany	db3838ccfe	Add flag to prevent natural health regen and hunger drain.	2020-01-09 20:41:57 -05:00
wizjany	789405d116	Ignore session reset if player doesn't move a block. So technically we do this block check in Session#testMoveTo, but the /wg flushstates command can force a session re-initialization even if the player hasn't moved a full block yet. The amount of logic going on between the event call and the point where we test that force boolean is rather lengthy though, so ignoring it for the time being may be worth it. TL;DR: Don't want WG in timings for PlayerMoveEvent needlessly.	2020-01-07 17:24:43 -05:00
wizjany	d37f015f0c	De-couple chest-access from interact. READ BELOW. This is possibly a breaking change, in that WG will be overprotective in regions which previously had interact set to allow but didn't change the chest-access flag. If you previously had regions like this where you would like to have non-members access chests, you will need to set the chest-access flag to allow. This change was made to alleviate some confusion that became more evident recently with lecterns, since interacting with lecterns allowed one to read a book, but the chest-access flag controlled taking the book. This required setting interact to allow and chest-access to deny (at least for nonmembers) to allow guests to read books but not take them. This is a tentative change and may be reverted if it is too unpopular. Thanks for testing dev builds :^)	2020-01-05 22:52:23 -05:00
wizjany	239eda3f96	Bump to snapshot. This will likely become 7.1 soon anyway.	2020-01-05 22:43:00 -05:00