From bec91b65ae91ccb0f5a3e04fe5c24f9287d85534 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 2 Oct 2020 10:39:21 +0000 Subject: [PATCH] Provisional clan halls do not need payment announcement. --- .../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 +- .../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 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 7534b73062..3dc6668851 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -352,7 +352,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index ac1668f069..e3e7f08cc1 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -357,7 +357,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index ac1668f069..e3e7f08cc1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -357,7 +357,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8b567df77a..59caf69a13 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -357,7 +357,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 8408b1288c..bb5331b536 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -357,7 +357,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index aa904e8725..f01b51ce45 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -357,7 +357,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index aa904e8725..f01b51ce45 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -357,7 +357,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 6fec99d620..09bcd42305 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -362,7 +362,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e64cb21c4c..f05797158c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -354,7 +354,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 99ffc2abb2..02ea9a9b20 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -354,7 +354,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4b384a5c07..8beb464d4e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -356,7 +356,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4b384a5c07..8beb464d4e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -356,7 +356,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 4b384a5c07..8beb464d4e 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -356,7 +356,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 84e86d32e1..c938d9e1cc 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -361,7 +361,7 @@ public class EnterWorld implements IClientIncomingPacket clan.broadcastToOnlineMembers(new ExPledgeCount(clan)); player.sendPacket(new PledgeSkillList(clan)); final ClanHall ch = ClanHallData.getInstance().getClanHallByClan(clan); - if ((ch != null) && (ch.getCostFailDay() > 0)) + if ((ch != null) && (ch.getCostFailDay() > 0) && (ch.getResidenceId() < 186)) { final SystemMessage sm = new SystemMessage(SystemMessageId.PAYMENT_FOR_YOUR_CLAN_HALL_HAS_NOT_BEEN_MADE_PLEASE_MAKE_PAYMENT_TO_YOUR_CLAN_WAREHOUSE_BY_S1_TOMORROW); sm.addInt(ch.getLease());