From 9d86398936d747a85107fde58f992630d4363490 Mon Sep 17 00:00:00 2001
From: Lennart ten Wolde <0p1q9o2w@hotmail.nl>
Date: Thu, 25 Feb 2016 00:03:52 +0100
Subject: [PATCH] change settings for better chat support

---
 .../bukkit/marriage2/config/Settings.java          |  4 ++--
 .../bukkit/marriage2/listeners/ChatListener.java   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java b/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java
index 520173f..4f82ebf 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/config/Settings.java
@@ -21,8 +21,8 @@ public class Settings<T> {
 	public static final Settings<Integer> COOLDOWN_KISS = new Settings<>("cooldown.kiss", 2);
 
     public static final Settings<String> PM_FORMAT = new Settings<>("chat.pm-format", "&4{heart}&c{name}&4{heart} &7{message}");
-    public static final Settings<String> CHAT_FORMAT = new Settings<>("chat.chat-married-format", "&4&l<3 &r{original_format}");
-    public static final Settings<String> CHAT_PRIORITY = new Settings<>("chat.chat-priority", "HIGH");
+    public static final Settings<String> CHAT_FORMAT = new Settings<>("chat.status-format", "&4&l<3 ");
+    public static final Settings<Boolean> FORCE_FORMAT = new Settings<>("chat.force-status-format", true);
 
     public static final Settings<Boolean> KISSES_ENABLED = new Settings<>("kisses.enabled", true);
     public static final Settings<Integer> KISSES_AMOUNT_MIN = new Settings<>("kisses.amount-min", 5);
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 5e68e3f..dca0ca6 100644
--- a/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java
+++ b/src/main/java/com/lenis0012/bukkit/marriage2/listeners/ChatListener.java
@@ -45,17 +45,17 @@ public class ChatListener implements Listener {
             return;
         }
 
-        if(Settings.CHAT_PRIORITY.value().toLowerCase().contains("high")) {
-            handleChat(event, mp);
-        }
+//        if(Settings.CHAT_PRIORITY.value().toLowerCase().contains("high")) {
+//            handleChat(event, mp);
+//        }
     }
 
     @EventHandler(priority = EventPriority.HIGH)
     public void onPlayerChatLate(AsyncPlayerChatEvent event) {
-        if(!Settings.CHAT_PRIORITY.value().toLowerCase().contains("low") || event.isCancelled()) return;
-        final Player player = event.getPlayer();
-        MPlayer mp = core.getMPlayer(player.getUniqueId());
-        handleChat(event, mp);
+//        if(!Settings.CHAT_PRIORITY.value().toLowerCase().contains("low") || event.isCancelled()) return;
+//        final Player player = event.getPlayer();
+//        MPlayer mp = core.getMPlayer(player.getUniqueId());
+//        handleChat(event, mp);
     }
 
     private void handleChat(AsyncPlayerChatEvent event, MPlayer mp) {