From 23261db70292efadce2a3c4c0353532e5b44438c Mon Sep 17 00:00:00 2001
From: Ryandw11 <6239385+ryandw11@users.noreply.github.com>
Date: Sun, 7 Jul 2019 16:55:49 -0700
Subject: [PATCH] Async Bug fix

Fixed an async bug.
See #2
---
 .classpath                                                 | 2 +-
 plugin.yml                                                 | 2 +-
 src/me/ryandw11/ultrachat/UltraChat.java                   | 2 +-
 src/me/ryandw11/ultrachat/api/GlobalChatEvent.java         | 2 +-
 src/me/ryandw11/ultrachat/api/JsonChatEvent.java           | 4 ++--
 src/me/ryandw11/ultrachat/api/WorldChatEvent.java          | 3 ++-
 src/me/ryandw11/ultrachat/formatting/PlayerFormatting.java | 2 ++
 src/me/ryandw11/ultrachat/gui/ColorGUI_1_13_R2.java        | 2 +-
 8 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.classpath b/.classpath
index fecb8aa..a71162d 100644
--- a/.classpath
+++ b/.classpath
@@ -10,6 +10,6 @@
 	<classpathentry kind="lib" path="D:/Spigot Development Dependencies/Spigot 1.10/PlaceholderAPI (1).jar"/>
 	<classpathentry kind="lib" path="D:/Spigot Development Dependencies/1.12/AdvancedBan-2.1.4-RELEASE.jar"/>
 	<classpathentry kind="lib" path="D:/Spigot Development Dependencies/1.12/EssentialsX-2.0.1.jar"/>
-	<classpathentry kind="lib" path="D:/Spigot Development Dependencies/Spigot 1.14.0-Pre5/spigot-1.14-pre5.jar"/>
+	<classpathentry kind="lib" path="D:/Spigot Development Dependencies/Spigot 1.13.2/spigot-1.13.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugin.yml b/plugin.yml
index bc2b8d9..9a3c5b6 100644
--- a/plugin.yml
+++ b/plugin.yml
@@ -1,5 +1,5 @@
 name: UltraChat
-version: 2.3.1-Pre1
+version: 2.3.2
 main: me.ryandw11.ultrachat.UltraChat
 author: Ryandw11
 description: A chat formatting plugin.
diff --git a/src/me/ryandw11/ultrachat/UltraChat.java b/src/me/ryandw11/ultrachat/UltraChat.java
index cb63e99..b7d52b3 100644
--- a/src/me/ryandw11/ultrachat/UltraChat.java
+++ b/src/me/ryandw11/ultrachat/UltraChat.java
@@ -46,7 +46,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 /**
  * Main Class
  * @author Ryandw11
- * @version 2.3.1-Pre1
+ * @version 2.3.1
  * Updated for 1.14.
  * (Very few API methods here)
  */
diff --git a/src/me/ryandw11/ultrachat/api/GlobalChatEvent.java b/src/me/ryandw11/ultrachat/api/GlobalChatEvent.java
index de34ca2..b5cf5fb 100644
--- a/src/me/ryandw11/ultrachat/api/GlobalChatEvent.java
+++ b/src/me/ryandw11/ultrachat/api/GlobalChatEvent.java
@@ -16,7 +16,7 @@ public class GlobalChatEvent extends Event {
 	 private boolean cancelled;
 
 	 public GlobalChatEvent(Player p, String chat) {
-		 super(true);
+		 super(false);
 	     player = p;
 	     this.chat = chat;
 	 }
diff --git a/src/me/ryandw11/ultrachat/api/JsonChatEvent.java b/src/me/ryandw11/ultrachat/api/JsonChatEvent.java
index 8a5890c..fd79a05 100644
--- a/src/me/ryandw11/ultrachat/api/JsonChatEvent.java
+++ b/src/me/ryandw11/ultrachat/api/JsonChatEvent.java
@@ -6,9 +6,9 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 /**
- * Event class
+ * Event class - 
+ * Async Event
  * @author Ryandw11
- *
  */
 public class JsonChatEvent extends Event {
 	 private static final HandlerList handlers = new HandlerList();
diff --git a/src/me/ryandw11/ultrachat/api/WorldChatEvent.java b/src/me/ryandw11/ultrachat/api/WorldChatEvent.java
index a6e3ef3..a219623 100644
--- a/src/me/ryandw11/ultrachat/api/WorldChatEvent.java
+++ b/src/me/ryandw11/ultrachat/api/WorldChatEvent.java
@@ -6,7 +6,8 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 /**
- * Event class
+ * Event class - 
+ * Async Event
  * @author Ryandw11
  *
  */
diff --git a/src/me/ryandw11/ultrachat/formatting/PlayerFormatting.java b/src/me/ryandw11/ultrachat/formatting/PlayerFormatting.java
index 83a40f1..892338d 100644
--- a/src/me/ryandw11/ultrachat/formatting/PlayerFormatting.java
+++ b/src/me/ryandw11/ultrachat/formatting/PlayerFormatting.java
@@ -1,5 +1,6 @@
 package me.ryandw11.ultrachat.formatting;
 
+import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import me.clip.placeholderapi.PlaceholderAPI;
@@ -25,6 +26,7 @@ public class PlayerFormatting {
 		world = PlaceholderAPI.setPlaceholders(p, ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("World.format")));
 		local = PlaceholderAPI.setPlaceholders(p, ChatColor.translateAlternateColorCodes('&', plugin.getConfig().getString("Local.format")));
 	}
+	
 	private String prefix;
 	private String suffix;
 	public String color;
diff --git a/src/me/ryandw11/ultrachat/gui/ColorGUI_1_13_R2.java b/src/me/ryandw11/ultrachat/gui/ColorGUI_1_13_R2.java
index d5d1a08..1e1f004 100644
--- a/src/me/ryandw11/ultrachat/gui/ColorGUI_1_13_R2.java
+++ b/src/me/ryandw11/ultrachat/gui/ColorGUI_1_13_R2.java
@@ -171,7 +171,7 @@ public class ColorGUI_1_13_R2 implements CommandExecutor, Listener, ColorGUI{
 	
 	@EventHandler
 	public void onInventoryClickEvent(InventoryClickEvent e){
-		if(!e.getInventory().getName().equalsIgnoreCase(Lang.COLOR_GUI.toString())) return;
+		if(!e.getInventory().getTitle().equalsIgnoreCase(Lang.COLOR_GUI.toString())) return;
 		
 		Player p = (Player) e.getWhoClicked();
 		e.setCancelled(true);