diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 024b76d419..127faf02bc 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -76,30 +76,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Create clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 024b76d419..127faf02bc 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -76,30 +76,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Create clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index aee103e2e5..c43bea615b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -77,30 +77,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Create clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index aee103e2e5..372673f408 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -77,30 +77,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Initialize clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index 1e795547a0..d636c5b16f 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -78,30 +78,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Create clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index aee103e2e5..c43bea615b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -77,30 +77,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Create clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index aee103e2e5..c43bea615b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -77,30 +77,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Create clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java index aee103e2e5..c43bea615b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/sql/impl/ClanTable.java @@ -77,30 +77,34 @@ public class ClanTable ForumsBBSManager.getInstance().initRoot(); } - L2Clan clan; - // Count the clans - int clanCount = 0; + // Get all clan ids. + final List cids = new ArrayList<>(); try (Connection con = DatabaseFactory.getConnection(); Statement s = con.createStatement(); ResultSet rs = s.executeQuery("SELECT clan_id FROM clan_data")) { while (rs.next()) { - final int clanId = rs.getInt("clan_id"); - _clans.put(clanId, new L2Clan(clanId)); - clan = getClan(clanId); - if (clan.getDissolvingExpiryTime() != 0) - { - scheduleRemoveClan(clan.getId()); - } - clanCount++; + cids.add(rs.getInt("clan_id")); } } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error restoring ClanTable.", e); } - LOGGER.info(getClass().getSimpleName() + ": Restored " + clanCount + " clans from the database."); + + // Create clans. + for (int cid : cids) + { + final L2Clan clan = new L2Clan(cid); + _clans.put(cid, clan); + if (clan.getDissolvingExpiryTime() != 0) + { + scheduleRemoveClan(clan.getId()); + } + } + + LOGGER.info(getClass().getSimpleName() + ": Restored " + cids.size() + " clans from the database."); allianceCheck(); restorewars(); }