fix: resolve white private messages capturing nons in lobbies with pr…

…efixes
Sk1erLLC · Apr 19, 2021 · 134c896 · 134c896
1 parent 528cf7e
commit 134c896
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/club/sk1er/hytilities/handlers/language/LanguageData.java b/src/main/java/club/sk1er/hytilities/handlers/language/LanguageData.java
@@ -64,11 +64,11 @@ public class LanguageData {
     private String chatRestylerFriendPattern = "^((?:\\u00a7r)?\\u00a7\\w)(Friend >)";
 
     private String autoChatSwapperPartyStatus = "^(?:You have been kicked from the party by (?:\\[.+] )?\\w{1,16}|(?:\\[.+] )?\\w{1,16} has disbanded the party!|You left the party.)$";
-    private String autoChatSwapperChannelSwap = "^(?:You are now in the (?<channel>ALL|GUILD|OFFICER) channel)";
+    private String autoChatSwapperChannelSwap = "^You are now in the (?<channel>ALL|GUILD|OFFICER) channel$";
     public String autoChatSwapperAlreadyInChannel = "You're already in this channel!";
 
     private String whiteChatNonMessage = "(?<prefix>.+)§7: (?<message>.*)";
-    private String privateMessageWhiteChat = "^(?<type>.+|To|From) (?<prefix>.+)§7: (?<message>.*)$";
+    private String privateMessageWhiteChat = "^(?<type>§dTo|§dFrom) (?<prefix>.+): §r(?<message>§7.*)(?:§r)?$";
 
     public String limboLimiterSpawned = "You were spawned in Limbo.";
     public String limboLimiterAfk = "You are AFK. Move around to return from AFK.";
@@ -157,5 +157,4 @@ public void initialize() {
 
         hypixelLevelUpRegex = Pattern.compile(hypixelLevelUp);
     }
-
 }
diff --git a/src/main/resources/languages/en.json b/src/main/resources/languages/en.json
@@ -24,9 +24,10 @@
   "chatRestylerGuildPattern": "^((?:\\u00a7r)?\\u00a7\\w)(Guild >)",
   "chatRestylerFriendPattern": "^((?:\\u00a7r)?\\u00a7\\w)(Friend >)",
   "autoChatSwapperPartyStatus": "^(?:You have been kicked from the party by (?:\\[.+] )?\\w{1,16}|(?:\\[.+] )?\\w{1,16} has disbanded the party!|You left the party.)$",
-  "autoChatSwapperChannelSwap": "^(?:You are now in the (?<channel>ALL|GUILD|OFFICER) channel)",
+  "autoChatSwapperChannelSwap": "^You are now in the (?<channel>ALL|GUILD|OFFICER) channel$",
   "autoChatSwapperAlreadyInChannel": "You're already in this channel!",
   "whiteChatNonMessage": "(?<prefix>.+)\u00a77: (?<message>.*)",
+  "privateMessageWhiteChat": "^(?<type>\u00a7dTo|\u00a7dFrom) (?<prefix>.+): \u00a7r(?<message>\u00a77.*)(?:\u00a7r)?$",
   "limboLimiterSpawned": "You were spawned in Limbo.",
   "limboLimiterAfk": "You are AFK. Move around to return from AFK.",
   "silentRemovalLeaveMessage": "(?:Friend|Guild) > (?<player>\\w{1,16}) left\\.",