From 66e856bb87b27c2a94aa667c01987d24591a116c Mon Sep 17 00:00:00 2001
From: Lennart ten Wolde <0p1q9o2w@hotmail.nl>
Date: Tue, 14 Jun 2016 17:35:22 +0200
Subject: [PATCH] Add permission for chat color

---
 .../com/lenis0012/bukkit/marriage2/MarriageAPI.java    | 10 +++++-----
 .../lenis0012/bukkit/marriage2/config/Permissions.java |  8 +++++++-
 .../bukkit/marriage2/listeners/ChatListener.java       |  5 ++++-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/MarriageAPI.java b/src/main/java/com/lenis0012/bukkit/marriage2/MarriageAPI.java
index 89b9b30..256ac27 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/MarriageAPI.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/MarriageAPI.java
@@ -8,19 +8,19 @@ import com.lenis0012.bukkit.marriage2.internal.MarriagePlugin;
  * <b>Changelog:</b>
  * 1.02:
  * <ul>
- * <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerMarryEvent PlayerMarryEvent}</li>
- * <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerDivorceEvent PlayerDivorceEvent}</li>
- * <li>Added {@link Marriage#marry(MPlayer, MPlayer, MPlayer) marry(p1, p2, priest)}</li>
+ *     <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerMarryEvent PlayerMarryEvent}</li>
+ *     <li>Added {@link com.lenis0012.bukkit.marriage2.events.PlayerDivorceEvent PlayerDivorceEvent}</li>
+ *     <li>Added {@link Marriage#marry(MPlayer, MPlayer, MPlayer) marry(p1, p2, priest)}</li>
  * </ul>
  * <p>
  * 1.01:
  * <ul>
- * <li>Added chat spy mode</li>
+ *     <li>Added chat spy mode</li>
  * </ul>
  * <p>
  * 1.00:
  * <ul>
- * <li>Release</li>
+ *     <li>Release</li>
  * </ul>
  */
 public class MarriageAPI {
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/config/Permissions.java b/src/main/java/com/lenis0012/bukkit/marriage2/config/Permissions.java
index bebd3e1..69d9471 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/config/Permissions.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/config/Permissions.java
@@ -20,6 +20,7 @@ public enum Permissions {
      */
     UPDATE("marry.update", 1),
     CHAT_SPY("marry.chatspy", 1),
+    MIGRATE("marry.migrate", 1),
     /**
      * Player commands
      */
@@ -30,7 +31,12 @@ public enum Permissions {
     SET_HOME("marry.sethome"),
     GIFT("marry.gift"),
     CHAT("marry.chat"),
-    SEEN("marry.seen");
+    SEEN("marry.seen"),
+    HEAL("marry.heal"),
+    /**
+     * Non-commands
+     */
+    CHAT_COLOR("marry.color", 1);
 
     private static boolean vaultEnabled = false;
     private static Permission permissionService;
diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java b/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java
index 51b265e..490262a 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java
@@ -1,6 +1,7 @@
 package com.lenis0012.bukkit.marriage2.listeners;
 
 import com.lenis0012.bukkit.marriage2.MPlayer;
+import com.lenis0012.bukkit.marriage2.config.Permissions;
 import com.lenis0012.bukkit.marriage2.config.Settings;
 import com.lenis0012.bukkit.marriage2.internal.MarriageCore;
 import org.bukkit.Bukkit;
@@ -32,10 +33,12 @@ public class ChatListener implements Listener {
             event.setCancelled(true);
             String message = Settings.PM_FORMAT.value()
                     .replace("{name}", player.getDisplayName())
-                    .replace("{message}", event.getMessage())
+//                    .replace("{message}", event.getMessage())
                     .replace("{heart}", "\u2764");
             message = formatIcons(message);
             message = ChatColor.translateAlternateColorCodes('&', message);
+            final String msg = Permissions.CHAT_COLOR.has(player) ? ChatColor.translateAlternateColorCodes('&', event.getMessage()) : event.getMessage();
+            message = message.replace("{message}", msg);
 
             Player partner = Bukkit.getPlayer(mp.getPartner().getUniqueId());
             player.sendMessage(message);