From 0b313fa2accf8a5f21347bcaea83c5150be65f61 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 30 Aug 2022 00:48:09 +0000 Subject: [PATCH] Fixed probable SendMessageLocalisationData getLocalisation NPE. --- .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ .../gameserver/data/xml/SendMessageLocalisationData.java | 5 +++++ 27 files changed, 135 insertions(+) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) { diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java index e45bb44da1..b0223f540c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/SendMessageLocalisationData.java @@ -91,6 +91,11 @@ public class SendMessageLocalisationData implements IXmlReader { if (Config.MULTILANG_ENABLE) { + if (player == null) + { + return message; + } + final Map localisations = SEND_MESSAGE_LOCALISATIONS.get(player.getLang()); if (localisations != null) {