diff --git a/src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java b/src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java index b0ee2763..013bc5ff 100644 --- a/src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java +++ b/src/main/java/com/sk89q/worldguard/session/handler/FarewellFlag.java @@ -20,6 +20,7 @@ package com.sk89q.worldguard.session.handler; import com.google.common.collect.Sets; +import com.sk89q.worldguard.bukkit.commands.CommandUtils; import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.flags.DefaultFlag; import com.sk89q.worldguard.protection.regions.ProtectedRegion; @@ -65,7 +66,9 @@ public boolean onCrossBoundary(Player player, Location from, Location to, Applic for (String message : lastMessageStack) { if (!messages.contains(message)) { - player.sendMessage(getPlugin().replaceMacros(player, message).replaceAll("\\\\n", "\n").split("\\n")); + String effective = CommandUtils.replaceColorMacros(message); + effective = getPlugin().replaceMacros(player, effective); + player.sendMessage(effective.replaceAll("\\\\n", "\n").split("\\n")); break; } } diff --git a/src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java b/src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java index d5e96e51..e82799e8 100644 --- a/src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java +++ b/src/main/java/com/sk89q/worldguard/session/handler/GreetingFlag.java @@ -20,6 +20,7 @@ package com.sk89q.worldguard.session.handler; import com.google.common.collect.Sets; +import com.sk89q.worldguard.bukkit.commands.CommandUtils; import com.sk89q.worldguard.protection.ApplicableRegionSet; import com.sk89q.worldguard.protection.flags.DefaultFlag; import com.sk89q.worldguard.protection.regions.ProtectedRegion; @@ -46,7 +47,9 @@ public boolean onCrossBoundary(Player player, Location from, Location to, Applic for (String message : messages) { if (!lastMessageStack.contains(message)) { - player.sendMessage(getPlugin().replaceMacros(player, message).replaceAll("\\\\n", "\n").split("\\n")); + String effective = CommandUtils.replaceColorMacros(message); + effective = getPlugin().replaceMacros(player, effective); + player.sendMessage(effective.replaceAll("\\\\n", "\n").split("\\n")); break; } }