2.2.4 Update

Author: LOOHP

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

@@ -66,8 +66,6 @@ public void checkChat(AsyncPlayerChatEvent event) {
 		if (InteractiveChat.ChatManagerHook) {
 			return;
 		}
-		
-		checkMention(event);
 
 		String message = event.getMessage();
 		if (InteractiveChat.maxPlacholders >= 0) {
@@ -100,12 +98,14 @@ public void checkChatforChatManager(AsyncPlayerChatEvent event) {
 		if (event.isCancelled()) {
 			return;
 		}
+		
+		checkMention(event);
+		
+		
 		if (!InteractiveChat.ChatManagerHook) {
 			return;
 		}
 
-		checkMention(event);
-		
 		String message = event.getMessage();
 		if (InteractiveChat.maxPlacholders >= 0) {
 			int count = 0;
@@ -151,25 +151,28 @@ private void checkMention(AsyncPlayerChatEvent event) {
        				int index = message.toLowerCase().indexOf(name.toLowerCase());
        				if (index >= 0) {
        					char escape = (index - 1) < 0 ? ' ' : message.charAt(index - 1);
-       					char escapeescape = (index - 2) < 0 ? ' ' : message.charAt(index - 2);
-       					if ((escape != '\\') || ((escape == '\\' && escapeescape == '\\'))) {
-       						if (escapeescape == '\\') {
-       							StringBuilder sb = new StringBuilder(message);
-	       						sb.deleteCharAt(index - 2);
-	       						event.setMessage(sb.toString());
-	       						message = event.getMessage();
-       						}
-       						if (!player.equals(sender)) {
-       							InteractiveChat.mentionPair.put(player.getUniqueId(), new MentionPair(sender.getUniqueId(), player.getUniqueId(), InteractiveChat.mentionPair));
-       						}
-       						break;
-       					} else {
-       						if (escape == '\\') {
-	       						StringBuilder sb = new StringBuilder(message);
-	       						sb.deleteCharAt(index - 1);
-	       						event.setMessage(sb.toString());
-	       						message = event.getMessage();
-       						}
+       					char after = (index + name.length()) >= message.length() ? ' ' : message.charAt(index + name.length());
+       					if (String.valueOf(escape).matches("[ \\\\]") && String.valueOf(after).matches("[ \\\\]")) {
+       						char escapeescape = (index - 2) < 0 ? ' ' : message.charAt(index - 2);
+           					if ((escape != '\\') || ((escape == '\\' && escapeescape == '\\'))) {
+           						if (escapeescape == '\\') {
+           							StringBuilder sb = new StringBuilder(message);
+    	       						sb.deleteCharAt(index - 2);
+    	       						event.setMessage(sb.toString());
+    	       						message = event.getMessage();
+           						}
+           						if (!player.equals(sender)) {
+           							InteractiveChat.mentionPair.put(player.getUniqueId(), new MentionPair(sender.getUniqueId(), player.getUniqueId(), InteractiveChat.mentionPair));
+           						}
+           						break;
+           					} else {
+           						if (escape == '\\') {
+    	       						StringBuilder sb = new StringBuilder(message);
+    	       						sb.deleteCharAt(index - 1);
+    	       						event.setMessage(sb.toString());
+    	       						message = event.getMessage();
+           						}
+           					}
        					}
        				}
        			}

src/plugin.yml

@@ -1,6 +1,6 @@
 name: InteractiveChat
 author: loohp
-version: 2.2.3
+version: 2.2.4
 main: com.loohp.interactivechat.InteractiveChat
 api-version: 1.13
 description: Make the chat interactive