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; * Changelog: * 1.02: * *

* 1.01: *

*

* 1.00: *

*/ 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);