From f11d8870a1c077a2722ebd070e3020b2dadefb92 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Thu, 10 May 2018 13:38:10 +0000
Subject: [PATCH] Clan notice html break line replacement. Contributed by
Sahar.
---
.../l2jmobius/gameserver/network/clientpackets/EnterWorld.java | 2 +-
.../l2jmobius/gameserver/network/clientpackets/EnterWorld.java | 2 +-
.../l2jmobius/gameserver/network/clientpackets/EnterWorld.java | 2 +-
.../l2jmobius/gameserver/network/clientpackets/EnterWorld.java | 2 +-
.../l2jmobius/gameserver/network/clientpackets/EnterWorld.java | 2 +-
.../l2jmobius/gameserver/network/clientpackets/EnterWorld.java | 2 +-
.../l2jmobius/gameserver/network/clientpackets/EnterWorld.java | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 0381d4eb50..9af2b1619d 100644
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -523,7 +523,7 @@ public class EnterWorld implements IClientIncomingPacket
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
- notice.replace("%notice_text%", activeChar.getClan().getNotice());
+ notice.replace("%notice_text%", activeChar.getClan().getNotice().replaceAll("\r\n", "
"));
notice.disableValidation();
client.sendPacket(notice);
}
diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index fb2f652796..34be76f911 100644
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -528,7 +528,7 @@ public class EnterWorld implements IClientIncomingPacket
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
- notice.replace("%notice_text%", activeChar.getClan().getNotice());
+ notice.replace("%notice_text%", activeChar.getClan().getNotice().replaceAll("\r\n", "
"));
notice.disableValidation();
client.sendPacket(notice);
}
diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index fb2f652796..34be76f911 100644
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -528,7 +528,7 @@ public class EnterWorld implements IClientIncomingPacket
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
- notice.replace("%notice_text%", activeChar.getClan().getNotice());
+ notice.replace("%notice_text%", activeChar.getClan().getNotice().replaceAll("\r\n", "
"));
notice.disableValidation();
client.sendPacket(notice);
}
diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index 8f2276f271..43c386b347 100644
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -528,7 +528,7 @@ public class EnterWorld implements IClientIncomingPacket
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
- notice.replace("%notice_text%", activeChar.getClan().getNotice());
+ notice.replace("%notice_text%", activeChar.getClan().getNotice().replaceAll("\r\n", "
"));
notice.disableValidation();
client.sendPacket(notice);
}
diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index d03ce1a31f..17e2b41b57 100644
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -513,7 +513,7 @@ public class EnterWorld implements IClientIncomingPacket
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
- notice.replace("%notice_text%", activeChar.getClan().getNotice());
+ notice.replace("%notice_text%", activeChar.getClan().getNotice().replaceAll("\r\n", "
"));
notice.disableValidation();
client.sendPacket(notice);
}
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index ed64137e4b..cd3e751a50 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -527,7 +527,7 @@ public class EnterWorld implements IClientIncomingPacket
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
- notice.replace("%notice_text%", activeChar.getClan().getNotice());
+ notice.replace("%notice_text%", activeChar.getClan().getNotice().replaceAll("\r\n", "
"));
notice.disableValidation();
client.sendPacket(notice);
}
diff --git a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
index c4374d85f7..5e4f070447 100644
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
@@ -527,7 +527,7 @@ public class EnterWorld implements IClientIncomingPacket
final NpcHtmlMessage notice = new NpcHtmlMessage();
notice.setFile(activeChar, "data/html/clanNotice.htm");
notice.replace("%clan_name%", activeChar.getClan().getName());
- notice.replace("%notice_text%", activeChar.getClan().getNotice());
+ notice.replace("%notice_text%", activeChar.getClan().getNotice().replaceAll("\r\n", "
"));
notice.disableValidation();
client.sendPacket(notice);
}