diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java index 107dac5278..84ead55b9e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1218,7 +1218,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1237,6 +1237,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java index b4c361f8e5..5ccc7c84fd 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java index b4c361f8e5..5ccc7c84fd 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java index b4c361f8e5..5ccc7c84fd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java index 092848c689..1ecbc4a391 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1129,7 +1129,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1148,6 +1148,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java index 092848c689..1ecbc4a391 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1129,7 +1129,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1148,6 +1148,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java index 092848c689..1ecbc4a391 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1129,7 +1129,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1148,6 +1148,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java index a191375a7e..b51535e304 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1128,7 +1128,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1147,6 +1147,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java index a191375a7e..b51535e304 100644 --- a/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1128,7 +1128,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1147,6 +1147,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java index a191375a7e..b51535e304 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1128,7 +1128,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1147,6 +1147,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java index 1ad840be22..fd2feac52e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -897,7 +897,7 @@ public class Clan public void setNoticeEnabledAndStore(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNoticeAndStore(String notice) @@ -917,7 +917,19 @@ public class Clan public String getNotice() { - return (_notice == null) ? "" : _notice; + if (_notice == null) + { + return ""; + } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + + return _notice; } public void setNotice(String notice) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java index a9fd11524a..dc682e39e7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -898,7 +898,7 @@ public class Clan public void setNoticeEnabledAndStore(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNoticeAndStore(String notice) @@ -918,7 +918,19 @@ public class Clan public String getNotice() { - return (_notice == null) ? "" : _notice; + if (_notice == null) + { + return ""; + } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + + return _notice; } public void setNotice(String notice) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java index 9f4adfb723..6e90426497 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1200,7 +1200,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1215,7 +1215,19 @@ public class Clan implements IIdentifiable, INamable public String getNotice() { - return _notice == null ? "" : _notice; + if (_notice == null) + { + return ""; + } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + + return _notice; } private void restoreSkills() diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java index 9f4adfb723..6e90426497 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1200,7 +1200,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1215,7 +1215,19 @@ public class Clan implements IIdentifiable, INamable public String getNotice() { - return _notice == null ? "" : _notice; + if (_notice == null) + { + return ""; + } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + + return _notice; } private void restoreSkills() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java index 6fc090c215..05379e7231 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java index 6fc090c215..05379e7231 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java index 69e16190b3..35023392eb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java index 69e16190b3..35023392eb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java index 69e16190b3..35023392eb 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java index 69e16190b3..35023392eb 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java index 6fc090c215..05379e7231 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java index c4ae8de3a1..8174cc4755 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1219,7 +1219,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1238,6 +1238,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java index 658691f563..f247c136e6 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -1240,7 +1240,7 @@ public class Clan implements IIdentifiable, INamable public void setNoticeEnabled(boolean enabled) { - storeNotice(_notice, enabled); + storeNotice(getNotice(), enabled); } public void setNotice(String notice) @@ -1259,6 +1259,14 @@ public class Clan implements IIdentifiable, INamable { return ""; } + + // Bypass exploit check. + final String text = _notice.toLowerCase(); + if (text.contains("action") && text.contains("bypass")) + { + return ""; + } + return _notice; }