From 36c8b30e92f4bda8e0fd78c756891f97e3268723 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <mobius@cyber-wizard.com>
Date: Sun, 7 Jan 2024 02:29:05 +0200
Subject: [PATCH] Community Board mails should not display <br> and <br1> tags.
 Contributed by G-hamsteR.

---
 .../gameserver/communitybbs/Manager/MailBBSManager.java         | 2 +-
 .../gameserver/communitybbs/Manager/MailBBSManager.java         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
index 4a4e8d0941..dfb26d2af2 100644
--- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
+++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
@@ -499,7 +499,7 @@ public class MailBBSManager extends BaseBBSManager
 		content = content.replace("%receiver%", letter.recipientNames);
 		content = content.replace("%delDate%", "Unknown");
 		content = content.replace("%title%", letter.subject.replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;"));
-		content = content.replace("%mes%", letter.message.replace("\r\n", "<br>").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;"));
+		content = content.replace("%mes%", letter.message.replace("\r\n", "<br>").replace("<br1>", "|||BR1|||").replace("<br>", "|||BR|||").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;").replace("|||BR|||", "<br>").replace("|||BR1|||", "<br1>"));
 		content = content.replace("%letterId%", letter.letterId + "");
 		separateAndSend(content, activeChar);
 	}
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
index 4a4e8d0941..dfb26d2af2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/communitybbs/Manager/MailBBSManager.java
@@ -499,7 +499,7 @@ public class MailBBSManager extends BaseBBSManager
 		content = content.replace("%receiver%", letter.recipientNames);
 		content = content.replace("%delDate%", "Unknown");
 		content = content.replace("%title%", letter.subject.replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;"));
-		content = content.replace("%mes%", letter.message.replace("\r\n", "<br>").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;"));
+		content = content.replace("%mes%", letter.message.replace("\r\n", "<br>").replace("<br1>", "|||BR1|||").replace("<br>", "|||BR|||").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;").replace("|||BR|||", "<br>").replace("|||BR1|||", "<br1>"));
 		content = content.replace("%letterId%", letter.letterId + "");
 		separateAndSend(content, activeChar);
 	}