diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index b9504dd0e0..ec026fd6e1 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5797,7 +5797,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7595,7 +7594,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7606,7 +7604,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index d34017c7e8..6fb757b380 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -239,7 +238,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1f22ab8d16..547f65913e 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5803,7 +5803,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7602,7 +7601,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7613,7 +7611,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 27aac0e898..306c13d7e4 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -240,7 +239,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 42da79dee4..155ee70ae1 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5805,7 +5805,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7604,7 +7603,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7615,7 +7613,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 27aac0e898..306c13d7e4 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -240,7 +239,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0610743112..cb47c034a8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5799,7 +5799,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7598,7 +7597,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7609,7 +7607,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 0ca952e359..c021f92097 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -240,7 +239,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8023fb09db..5fb5e67d0e 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5781,7 +5781,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7580,7 +7579,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7591,7 +7589,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 6e6e98fa70..b5ea93e45c 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.instancemanager.PremiumManager; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; @@ -308,7 +307,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index d1e8b2d100..bbc2734155 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5781,7 +5781,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7580,7 +7579,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7591,7 +7589,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 964411389b..9205e95771 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.instancemanager.PremiumManager; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; @@ -329,7 +328,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 2356a375a0..60daa67ae2 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5782,7 +5782,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7581,7 +7580,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7592,7 +7590,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 964411389b..9205e95771 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.instancemanager.PremiumManager; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; @@ -329,7 +328,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 61ec6b3629..aa9af66624 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5694,7 +5694,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7489,7 +7488,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7500,7 +7498,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 964411389b..9205e95771 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.instancemanager.PremiumManager; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; @@ -329,7 +328,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 8f4b81ed57..bd43780773 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5976,7 +5976,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7780,7 +7779,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7790,7 +7788,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java index 52a74b0ee3..79a710b1a8 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/Mail.java @@ -23,7 +23,6 @@ import java.util.logging.Level; import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.gameserver.enums.ItemLocation; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.model.items.instance.ItemInstance; @@ -162,12 +161,11 @@ public class Mail extends ItemContainer @Override public void deleteMe() { - _items.forEach(i -> + _items.forEach(item -> { - i.updateDatabase(true); - i.deleteMe(); - World.getInstance().removeObject(i); - IdFactory.getInstance().releaseId(i.getObjectId()); + item.updateDatabase(true); + item.deleteMe(); + World.getInstance().removeObject(item); }); _items.clear(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index d815462d26..d0e48099c3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.World; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; @@ -193,7 +192,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index e2980b2624..d188e5e10d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5768,7 +5768,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7566,7 +7565,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7577,7 +7575,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 27aac0e898..306c13d7e4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -240,7 +239,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index ea08b34ac6..be38da458e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5769,7 +5769,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7567,7 +7566,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7578,7 +7576,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 0ca952e359..c021f92097 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -240,7 +239,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0ae9004067..00dd291764 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5754,7 +5754,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7552,7 +7551,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7563,7 +7561,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 0c429e33d9..bf20762e29 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -283,7 +282,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 72e8081bb9..1c4e80abd1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5765,7 +5765,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7579,7 +7578,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7590,7 +7588,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 2f1cc3bcf4..7133bf30a3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -305,7 +304,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 5e2e48de17..bd6131166c 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5765,7 +5765,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7579,7 +7578,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7590,7 +7588,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 2f1cc3bcf4..7133bf30a3 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -305,7 +304,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 1c1f015844..6f705db4b9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -5662,7 +5662,6 @@ public class PlayerInstance extends Playable if (Config.OFFLINE_DISCONNECT_FINISHED && (privateStoreType == PrivateStoreType.NONE) && ((_client == null) || _client.isDetached())) { - IdFactory.getInstance().releaseId(getObjectId()); Disconnection.of(this).storeMe().deleteMe(); } } @@ -7472,7 +7471,6 @@ public class PlayerInstance extends Playable try (Connection con = DatabaseFactory.getConnection(); PreparedStatement ps = con.prepareStatement(ADD_NEW_SKILLS)) { - con.setAutoCommit(false); for (Skill addSkill : newSkills) { ps.setInt(1, getObjectId()); @@ -7483,7 +7481,6 @@ public class PlayerInstance extends Playable ps.addBatch(); } ps.executeBatch(); - con.commit(); } catch (SQLException e) { diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java index 2f1cc3bcf4..7133bf30a3 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectionInfo.java @@ -29,7 +29,6 @@ import org.l2jmobius.commons.database.DatabaseFactory; import org.l2jmobius.commons.network.PacketWriter; import org.l2jmobius.gameserver.data.sql.impl.ClanTable; import org.l2jmobius.gameserver.data.xml.impl.ExperienceData; -import org.l2jmobius.gameserver.idfactory.IdFactory; import org.l2jmobius.gameserver.model.CharSelectInfoPackage; import org.l2jmobius.gameserver.model.VariationInstance; import org.l2jmobius.gameserver.model.World; @@ -305,7 +304,6 @@ public class CharSelectionInfo implements IClientOutgoingPacket final PlayerInstance player = World.getInstance().getPlayer(charInfopackage.getObjectId()); if (player != null) { - IdFactory.getInstance().releaseId(player.getObjectId()); Disconnection.of(player).storeMe().deleteMe(); } }