From 6d431cebc5b94ba673fae9c213dd0f6d54ba7fed Mon Sep 17 00:00:00 2001
From: Aust1n46 <aust1n46@yahoo.com>
Date: Tue, 3 Mar 2020 22:07:03 -0500
Subject: [PATCH] Added 'support' for Bukkit /reload.

---
 .../mineverse/Aust1n46/chat/MineverseChat.java | 17 ++++++++++-------
 .../Aust1n46/chat/api/MineverseChatPlayer.java | 12 ++++++++++--
 .../Aust1n46/chat/listeners/LoginListener.java | 18 +++++-------------
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
index d2abe61..9ad7308 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/MineverseChat.java
@@ -211,6 +211,13 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 		// Get config and handle
 		// Configuration
 		//Localization.initialize();
+		
+		Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Registering Listeners"));
+		// Channel information reference
+		aaInfo = new AliasInfo(this);
+		jfInfo = new JsonFormatInfo(this);
+		gsInfo = new GuiSlotInfo();
+		
 		PlayerData.initialize();
 		if(this.firstRun) {
 			for(String uuidString : PlayerData.getPlayerData().getConfigurationSection("players").getKeys(false)) {
@@ -258,7 +265,7 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 				boolean filter = PlayerData.getPlayerData().getConfigurationSection("players." + uuidString).getBoolean("filter");
 				boolean notifications = PlayerData.getPlayerData().getConfigurationSection("players." + uuidString).getBoolean("notifications");
 				String nickname = PlayerData.getPlayerData().getConfigurationSection("players." + uuidString).getString("nickname");
-				String jsonFormat = PlayerData.getPlayerData().getConfigurationSection("players." + uuidString).getString("jsonformat");
+				String jsonFormat = "Default";
 				boolean spy = PlayerData.getPlayerData().getConfigurationSection("players." + uuidString).getBoolean("spy", false);
 				boolean commandSpy = PlayerData.getPlayerData().getConfigurationSection("players." + uuidString).getBoolean("commandspy", false);
 				boolean rangedSpy = PlayerData.getPlayerData().getConfigurationSection("players." + uuidString).getBoolean("rangedspy", false);
@@ -271,15 +278,11 @@ public class MineverseChat extends JavaPlugin implements PluginMessageListener {
 			MineverseChatPlayer mcp = MineverseChatAPI.getMineverseChatPlayer(p);
 			mcp.setName(p.getName());
 			mcp.setOnline(true);
+			mcp.setHasPlayed(false);
+			mcp.setJsonFormat();
 			onlinePlayers.add(mcp);
 		}
 
-		Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - Registering Listeners"));
-		// Channel information reference
-		aaInfo = new AliasInfo(this);
-		jfInfo = new JsonFormatInfo(this);
-		gsInfo = new GuiSlotInfo();
-
 		if(ccInfo == null) {
 			Bukkit.getConsoleSender().sendMessage(Format.FormatStringAll("&8[&eVentureChat&8]&e - &cConfiguration is BAD!"));
 		}
diff --git a/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java b/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java
index 1c33490..c857d7e 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/api/MineverseChatPlayer.java
@@ -7,7 +7,9 @@ import java.util.Set;
 import java.util.UUID;
 
 import mineverse.Aust1n46.chat.ChatMessage;
+import mineverse.Aust1n46.chat.MineverseChat;
 import mineverse.Aust1n46.chat.channel.ChatChannel;
+import mineverse.Aust1n46.chat.json.JsonFormat;
 
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -516,7 +518,13 @@ public class MineverseChatPlayer {
 		return this.jsonFormat;
 	}
 
-	public void setJsonFormat(String jsonFormat) {
-		this.jsonFormat = jsonFormat;
+	public void setJsonFormat() {
+		for(JsonFormat j : MineverseChat.jfInfo.getJsonFormats()) {
+			if(this.getPlayer().hasPermission("venturechat.json." + j.getName())) {
+				if(MineverseChat.jfInfo.getJsonFormat(this.getJsonFormat()).getPriority() > j.getPriority()) {
+					this.jsonFormat = j.getName();
+				}
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java b/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java
index 507c70c..3e650d1 100644
--- a/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java
+++ b/MineverseChat/mineverse/Aust1n46/chat/listeners/LoginListener.java
@@ -15,7 +15,6 @@ import mineverse.Aust1n46.chat.api.MineverseChatPlayer;
 import mineverse.Aust1n46.chat.channel.ChatChannel;
 import mineverse.Aust1n46.chat.channel.ChatChannelInfo;
 import mineverse.Aust1n46.chat.database.PlayerData;
-import mineverse.Aust1n46.chat.json.JsonFormat;
 import mineverse.Aust1n46.chat.utilities.Format;
 
 import org.bukkit.configuration.ConfigurationSection;
@@ -86,23 +85,16 @@ public class LoginListener implements Listener {
 		mcp.setOnline(true);
 		mcp.setHasPlayed(false);
 		MineverseChat.onlinePlayers.add(mcp);
-		mcp.setJsonFormat("Default");
-		for(JsonFormat j : MineverseChat.jfInfo.getJsonFormats()) {
-			if(mcp.getPlayer().hasPermission("venturechat.json." + j.getName())) {
-				if(MineverseChat.jfInfo.getJsonFormat(mcp.getJsonFormat()).getPriority() > j.getPriority()) {
-					mcp.setJsonFormat(j.getName());
-				}
-			}
-		}
+		mcp.setJsonFormat();
 		if(mcp.getNickname().equals(mcp.getName())) {
 			mcp.setNickname(event.getPlayer().getName());
 		}
 		mcp.getPlayer().setDisplayName(Format.FormatStringAll(mcp.getNickname()));
-		String nick = mcp.getNickname();
-		if(nick.length() >= 16) {
-			nick = nick.substring(0, 16);
-		}
 		if(plugin.getConfig().getBoolean("nickname-in-tablist", false)) {
+			String nick = mcp.getNickname();
+			if(nick.length() >= 16) {
+				nick = nick.substring(0, 16);
+			}
 			mcp.getPlayer().setPlayerListName(Format.FormatStringAll(nick));
 		}	
 		for(ChatChannel ch : MineverseChat.ccInfo.getAutojoinList()) {