From 6c67ab2c21fa6ac714d56a82e91ae9770a0c3922 Mon Sep 17 00:00:00 2001
From: creatorfromhell <daniel.viddy@gmail.com>
Date: Wed, 15 May 2019 21:57:25 -0400
Subject: [PATCH] Fixed issued with chat formatting.

---
 pom.xml                                 | 2 +-
 src/net/tnemc/tnc/core/ChatManager.java | 5 +++--
 src/net/tnemc/tnc/core/TheNewChat.java  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3b8e674..c633df4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.tnemc.tnc</groupId>
     <artifactId>TheNewChat</artifactId>
-    <version>0.1.0.0</version>
+    <version>1.5.0.0</version>
     <name>TheNewChat</name>
     <properties>
         <maven.compiler.source>1.8</maven.compiler.source>
diff --git a/src/net/tnemc/tnc/core/ChatManager.java b/src/net/tnemc/tnc/core/ChatManager.java
index d04896a..31c1522 100644
--- a/src/net/tnemc/tnc/core/ChatManager.java
+++ b/src/net/tnemc/tnc/core/ChatManager.java
@@ -158,7 +158,8 @@ public void onChat(AsyncPlayerChatEvent event) {
     if(!permission.equalsIgnoreCase("") && !event.getPlayer().hasPermission(permission)) {
       event.setCancelled(true);
     }
-    event.setFormat(formatMessage(event.getPlayer(), recipients, channel, event.getMessage()));
+    event.setMessage(formatMessage(event.getPlayer(), recipients, channel, event.getMessage()));
+    event.setFormat("%2$s");
   }
 
   public String formatMessage(final Player player, Collection<Player> recipients, final String channel, final String message) {
@@ -167,7 +168,7 @@ public String formatMessage(final Player player, Collection<Player> recipients,
 
     if(handler.equalsIgnoreCase("") || channel.equalsIgnoreCase("general")) {
       String format = parseCoreVariables(player, message, CoreConfigNodes.CORE_GENERAL_CHAT_FORMAT.getString());
-      if(Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI")) {
+      if(Bukkit.getPluginManager().isPluginEnabled("PlaceholderAPI") && PlaceholderAPI.containsPlaceholders(format)) {
         format = PlaceholderAPI.setPlaceholders(player, format);
       }
       if(!generalHandler.equalsIgnoreCase("core") &&
diff --git a/src/net/tnemc/tnc/core/TheNewChat.java b/src/net/tnemc/tnc/core/TheNewChat.java
index ab6f134..645e120 100644
--- a/src/net/tnemc/tnc/core/TheNewChat.java
+++ b/src/net/tnemc/tnc/core/TheNewChat.java
@@ -47,7 +47,7 @@ public class TheNewChat extends JavaPlugin {
 
   private File chatsFile;
   private FileConfiguration chatsConfiguration;
-  private String version = "0.0.1.0";
+  private String version = "1.5.0.0";
 
   private SaveManager saveManager;