From 84017bffc459525caf11f9b269458e3d297ea568 Mon Sep 17 00:00:00 2001 From: Matthew Miller Date: Sat, 19 Jan 2019 21:51:52 +1000 Subject: [PATCH] Added macro and colour support to deny-message --- .../worldguard/bukkit/listener/RegionProtectionListener.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java index c44e2d1c..7d0753ba 100644 --- a/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java +++ b/worldguard-legacy/src/main/java/com/sk89q/worldguard/bukkit/listener/RegionProtectionListener.java @@ -39,6 +39,7 @@ import com.sk89q.worldguard.bukkit.util.Events; 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.domains.Association; import com.sk89q.worldguard.internal.permission.RegionPermissionModel; @@ -111,6 +112,8 @@ private void tellErrorMessage(DelegateEvent event, Cause cause, Location locatio if (lastTime == null || now - lastTime >= LAST_MESSAGE_DELAY) { RegionQuery query = WorldGuard.getInstance().getPlatform().getRegionContainer().createQuery(); String message = query.queryValue(BukkitAdapter.adapt(location), localPlayer, Flags.DENY_MESSAGE); + message = WorldGuard.getInstance().getPlatform().getMatcher().replaceMacros(localPlayer, message); + message = CommandUtils.replaceColorMacros(message); if (message != null && !message.isEmpty()) { player.sendMessage(message.replace("%what%", what)); }