Only keep messages for 3 seconds so old unmatcjed messages doesn't mess things up

Author: LOOHP

src/com/loohp/interactivechat/Listeners/Events.java

@@ -113,7 +113,10 @@ public void checkChat(AsyncPlayerChatEvent event) {
 
 		event.setMessage(MessageUtils.preprocessMessage(message, InteractiveChat.placeholderList, InteractiveChat.aliasesMapping));
 
-		InteractiveChat.messages.put(ChatColorUtils.stripColor(ChatColorUtils.translateAlternateColorCodes('&', event.getMessage())), event.getPlayer().getUniqueId());
+		String mapKey = ChatColorUtils.stripColor(ChatColorUtils.translateAlternateColorCodes('&', event.getMessage()));
+		InteractiveChat.messages.put(mapKey, event.getPlayer().getUniqueId());
+		Bukkit.getScheduler().runTaskLater(InteractiveChat.plugin, () -> InteractiveChat.messages.remove(mapKey), 60);
+		
 		if (InteractiveChat.bungeecordMode) {
 			try {
 				BungeeMessageSender.addMessage(ChatColorUtils.stripColor(ChatColorUtils.translateAlternateColorCodes('&', event.getMessage())), event.getPlayer().getUniqueId());
@@ -165,7 +168,10 @@ public void checkChatforChatManagerOrTranslateChatColor(AsyncPlayerChatEvent eve
 		message = MessageUtils.preprocessMessage(message, InteractiveChat.placeholderList, InteractiveChat.aliasesMapping);
 		event.setMessage(message);
 
-		InteractiveChat.messages.put(ChatColorUtils.stripColor(ChatColorUtils.translateAlternateColorCodes('&', event.getMessage())), player.getUniqueId());
+		String mapKey = ChatColorUtils.stripColor(ChatColorUtils.translateAlternateColorCodes('&', event.getMessage()));
+		InteractiveChat.messages.put(mapKey, player.getUniqueId());
+		Bukkit.getScheduler().runTaskLater(InteractiveChat.plugin, () -> InteractiveChat.messages.remove(mapKey), 60);
+		
 		if (InteractiveChat.bungeecordMode) {
 			try {
 				BungeeMessageSender.addMessage(ChatColorUtils.stripColor(ChatColorUtils.translateAlternateColorCodes('&', event.getMessage())), event.getPlayer().getUniqueId());

src/com/loohp/interactivechat/Modules/SenderFinder.java

@@ -1,7 +1,6 @@
 package com.loohp.interactivechat.Modules;
 
 import java.util.HashMap;
-import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.UUID;
@@ -18,8 +17,6 @@
 
 public class SenderFinder {
 
-	private static Map<String, UUID> messages = InteractiveChat.messages;
-	
 	public static Optional<PlayerWrapper> getSender(BaseComponent basecomponent, String messageKey) {
 		PlayerWrapper keyPlayer = InteractiveChat.keyPlayer.get(messageKey);
 		if (keyPlayer != null) {
@@ -28,11 +25,12 @@ public static Optional<PlayerWrapper> getSender(BaseComponent basecomponent, Str
 
 		String chat = basecomponent.toPlainText();
 
-		for (Entry<String, UUID> entry : messages.entrySet()) {
+		for (Entry<String, UUID> entry : InteractiveChat.messages.entrySet()) {
 			String msg = entry.getKey();
 			if (chat.contains(msg)) {
-				Player player = Bukkit.getPlayer(entry.getValue());
-				Bukkit.getScheduler().runTaskLaterAsynchronously(InteractiveChat.plugin, () -> messages.remove(entry.getKey()), 5);
+				UUID uuid = entry.getValue();
+				Player player = Bukkit.getPlayer(uuid);
+				Bukkit.getScheduler().runTaskLaterAsynchronously(InteractiveChat.plugin, () -> InteractiveChat.messages.values(), 5);
 				if (player != null) {
 					return Optional.of(new PlayerWrapper(player));
 				}
@@ -45,7 +43,7 @@ public static Optional<PlayerWrapper> getSender(BaseComponent basecomponent, Str
 
 		String mostsimular = null;
 		double currentsim = 0.5;
-		for (Entry<String, UUID> entry : messages.entrySet()) {
+		for (Entry<String, UUID> entry : InteractiveChat.messages.entrySet()) {
 			String msg = entry.getKey();
 			double sim = CustomStringUtils.similarity(chat, msg);
 			if (sim > currentsim) {
@@ -55,9 +53,9 @@ public static Optional<PlayerWrapper> getSender(BaseComponent basecomponent, Str
 		}
 
 		if (mostsimular != null) {
-			UUID uuid = messages.get(mostsimular);
+			UUID uuid = InteractiveChat.messages.get(mostsimular);
 			String finalmostsimular = mostsimular;
-			Bukkit.getScheduler().runTaskLaterAsynchronously(InteractiveChat.plugin, () -> messages.remove(finalmostsimular), 5);
+			Bukkit.getScheduler().runTaskLaterAsynchronously(InteractiveChat.plugin, () -> InteractiveChat.messages.remove(finalmostsimular), 5);
 			Player player = Bukkit.getPlayer(uuid);
 			if (player != null) {
 				return Optional.of(new PlayerWrapper(player));

src/com/loohp/interactivechat/PluginMessaging/BungeeMessageListener.java

@@ -129,7 +129,7 @@ public void onPluginMessageReceived(String channel, Player pluginMessagingPlayer
 	        	player.getEquipment().setChestplate(equipment[1]);
 	        	player.getEquipment().setLeggings(equipment[2]);
 	        	player.getEquipment().setBoots(equipment[3]);
-	        	if (size < 6) {
+	        	if (InteractiveChat.version.isOld()) {
 	        		player.getEquipment().setItemInHand(equipment[4]);
 	        	} else {
 	        		player.getEquipment().setItemInMainHand(equipment[4]);
@@ -170,6 +170,7 @@ public void onPluginMessageReceived(String channel, Player pluginMessagingPlayer
 	        		break;
 	        	}
 	        	InteractiveChat.messages.put(message, uuid3);
+	    		Bukkit.getScheduler().runTaskLater(InteractiveChat.plugin, () -> InteractiveChat.messages.remove(message), 60);
 	        	break;
 	        case 0x07:
 	        	UUID uuid4 = DataTypeIO.readUUID(input);