diff --git a/L2J_Mobius_C6_Interlude/dist/libs/mariadb-java-client-2.3.0.jar b/L2J_Mobius_C6_Interlude/dist/libs/mariadb-java-client-2.3.0.jar new file mode 100644 index 0000000000..cbfa673976 Binary files /dev/null and b/L2J_Mobius_C6_Interlude/dist/libs/mariadb-java-client-2.3.0.jar differ diff --git a/L2J_Mobius_C6_Interlude/dist/libs/mysql-connector-java-5.1.46.jar b/L2J_Mobius_C6_Interlude/dist/libs/mysql-connector-java-5.1.46.jar deleted file mode 100644 index 6d26d72246..0000000000 Binary files a/L2J_Mobius_C6_Interlude/dist/libs/mysql-connector-java-5.1.46.jar and /dev/null differ diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java index 35df84a3f8..e1dfa3a6eb 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -53,7 +53,6 @@ import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.UserInfo; -import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException; /** * This class ... @@ -1139,7 +1138,7 @@ public class L2Clan statement.execute(); statement.close(); } - catch (MySQLIntegrityConstraintViolationException e) // update to avoid miss information + catch (Exception e) // update to avoid miss information { statement = con.prepareStatement("UPDATE clan_skills SET skill_level=? WHERE skill_id=? AND clan_id=?"); statement.setInt(1, newSkill.getLevel()); diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java index f7e9ca3b1d..955503fe72 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java @@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; -import java.sql.SQLException; import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.LogRecord; @@ -52,7 +51,6 @@ import com.l2jmobius.gameserver.templates.item.L2Item; import com.l2jmobius.gameserver.templates.item.L2Weapon; import com.l2jmobius.gameserver.util.IllegalPlayerAction; import com.l2jmobius.gameserver.util.Util; -import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException; /** * This class manages items. @@ -1434,7 +1432,7 @@ public final class L2ItemInstance extends L2Object _storedInDb = true; statement.close(); } - catch (MySQLIntegrityConstraintViolationException e) + catch (Exception e) { if (Config.DEBUG) { @@ -1442,10 +1440,6 @@ public final class L2ItemInstance extends L2Object } updateInDb(); } - catch (SQLException e) - { - e.printStackTrace(); - } } /** diff --git a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java index e925f1e253..b9507a92b2 100644 --- a/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java @@ -54,7 +54,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.scripting.ManagedScript; import com.l2jmobius.gameserver.scripting.ScriptManager; import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate; -import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException; /** * @author Luis Arias @@ -1362,13 +1361,9 @@ public class Quest extends ManagedScript statement.executeUpdate(); statement.close(); } - catch (MySQLIntegrityConstraintViolationException e) - { - updateQuestVarInDb(qs, var, value); - } catch (Exception e) { - LOGGER.warning("could not insert char quest: " + e); + updateQuestVarInDb(qs, var, value); } }