diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java index 73b7173329..a26b28f63c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/instancemanager/ClanEntryManager.java @@ -36,6 +36,7 @@ import java.util.stream.Collectors; import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.CommonUtil; +import com.l2jmobius.gameserver.data.sql.impl.ClanTable; import com.l2jmobius.gameserver.model.clan.entry.PledgeApplicantInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; import com.l2jmobius.gameserver.model.clan.entry.PledgeWaitingInfo; @@ -97,7 +98,13 @@ public class ClanEntryManager { while (rs.next()) { - _clanList.put(rs.getInt("clan_id"), new PledgeRecruitInfo(rs.getInt("clan_id"), rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + final int clanId = rs.getInt("clan_id"); + _clanList.put(clanId, new PledgeRecruitInfo(clanId, rs.getInt("karma"), rs.getString("information"), rs.getString("detailed_information"), rs.getInt("application_type"), rs.getInt("recruit_type"))); + // Remove non existing clan data. + if (ClanTable.getInstance().getClan(clanId) == null) + { + removeFromClanList(clanId); + } } LOGGER.info(getClass().getSimpleName() + ": Loaded: " + _clanList.size() + " clan entry"); }