From 5111d40aaf5056237e2a0ca1a038243924ef31c7 Mon Sep 17 00:00:00 2001 From: wizjany Date: Mon, 19 Jan 2015 14:23:04 -0500 Subject: [PATCH] Add colorification to entry and exit messages as well. --- .../java/com/sk89q/worldguard/session/handler/EntryFlag.java | 3 ++- .../java/com/sk89q/worldguard/session/handler/ExitFlag.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java b/src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java index 5de3cfe8..c40698f1 100644 --- a/src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java +++ b/src/main/java/com/sk89q/worldguard/session/handler/EntryFlag.java @@ -20,6 +20,7 @@ package com.sk89q.worldguard.session.handler; import com.sk89q.worldguard.LocalPlayer; +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; @@ -49,7 +50,7 @@ public boolean onCrossBoundary(Player player, Location from, Location to, Applic long now = System.currentTimeMillis(); if ((now - lastMessage) > MESSAGE_THRESHOLD && message != null && !message.isEmpty()) { - player.sendMessage(message); + player.sendMessage(CommandUtils.replaceColorMacros(message)); lastMessage = now; } diff --git a/src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java b/src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java index 79d4fe68..77b91249 100644 --- a/src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java +++ b/src/main/java/com/sk89q/worldguard/session/handler/ExitFlag.java @@ -20,6 +20,7 @@ package com.sk89q.worldguard.session.handler; import com.sk89q.worldguard.LocalPlayer; +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.flags.StateFlag; @@ -49,7 +50,7 @@ private void sendMessage(Player player) { long now = System.currentTimeMillis(); if ((now - lastMessage) > MESSAGE_THRESHOLD && storedMessage != null && !storedMessage.isEmpty()) { - player.sendMessage(storedMessage); + player.sendMessage(CommandUtils.replaceColorMacros(storedMessage)); lastMessage = now; } }