lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MariaDB changes for Interlude.

Browse Source
This commit is contained in:
MobiusDev 2018-09-09 12:22:23 +00:00
parent a35c926237
commit fb4845b56d
5 changed files with 3 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
L2J_Mobius_C6_Interlude/dist/libs/mariadb-java-client-2.3.0.jar vendored Normal file
View File

Binary file not shown.

BIN
L2J_Mobius_C6_Interlude/dist/libs/mysql-connector-java-5.1.46.jar vendored
View File

Binary file not shown.

3
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/L2Clan.java
View File

@ -53,7 +53,6 @@ import com.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd;
import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate; import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.network.serverpackets.UserInfo; import com.l2jmobius.gameserver.network.serverpackets.UserInfo;
import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException;
/** /**
* This class ... * This class ...
@ -1139,7 +1138,7 @@ public class L2Clan
statement.execute(); statement.execute();
statement.close(); 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 = con.prepareStatement("UPDATE clan_skills SET skill_level=? WHERE skill_id=? AND clan_id=?");
statement.setInt(1, newSkill.getLevel()); statement.setInt(1, newSkill.getLevel());

8
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/actor/instance/L2ItemInstance.java
View File

@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.actor.instance;
import java.sql.Connection; import java.sql.Connection;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.LogRecord; 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.templates.item.L2Weapon;
import com.l2jmobius.gameserver.util.IllegalPlayerAction; import com.l2jmobius.gameserver.util.IllegalPlayerAction;
import com.l2jmobius.gameserver.util.Util; import com.l2jmobius.gameserver.util.Util;
import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException;
/** /**
* This class manages items. * This class manages items.
@ -1434,7 +1432,7 @@ public final class L2ItemInstance extends L2Object
_storedInDb = true; _storedInDb = true;
statement.close(); statement.close();
} }
catch (MySQLIntegrityConstraintViolationException e) catch (Exception e)
{ {
if (Config.DEBUG) if (Config.DEBUG)
{ {
@ -1442,10 +1440,6 @@ public final class L2ItemInstance extends L2Object
} }
updateInDb(); updateInDb();
} }
catch (SQLException e)
{
e.printStackTrace();
}
} }
/** /**

7
L2J_Mobius_C6_Interlude/java/com/l2jmobius/gameserver/model/quest/Quest.java
View File

@ -54,7 +54,6 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
import com.l2jmobius.gameserver.scripting.ManagedScript; import com.l2jmobius.gameserver.scripting.ManagedScript;
import com.l2jmobius.gameserver.scripting.ScriptManager; import com.l2jmobius.gameserver.scripting.ScriptManager;
import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate; import com.l2jmobius.gameserver.templates.chars.L2NpcTemplate;
import com.mysql.jdbc.exceptions.jdbc4.MySQLIntegrityConstraintViolationException;
/** /**
* @author Luis Arias * @author Luis Arias
@ -1362,13 +1361,9 @@ public class Quest extends ManagedScript
statement.executeUpdate(); statement.executeUpdate();
statement.close(); statement.close();
} }
catch (MySQLIntegrityConstraintViolationException e)
{
updateQuestVarInDb(qs, var, value);
}
catch (Exception e) catch (Exception e)
{ {
LOGGER.warning("could not insert char quest: " + e); updateQuestVarInDb(qs, var, value);
} }
} }