Dropped c3p0 in favor of HikariCP.

This commit is contained in:
MobiusDev
2018-09-08 19:27:23 +00:00
parent 6fd681adcf
commit eb3742d44f
1149 changed files with 3883 additions and 4317 deletions

View File

@@ -297,7 +297,7 @@ public class VanHalter extends Quest
{
_royalGuardSpawn.clear();
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid between ? and ? ORDER BY id");
statement.setInt(1, 22175);
@@ -372,7 +372,7 @@ public class VanHalter extends Quest
{
_triolRevelationSpawn.clear();
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid between ? and ? ORDER BY id");
statement.setInt(1, 32058);
@@ -451,7 +451,7 @@ public class VanHalter extends Quest
{
_royalGuardCaptainSpawn.clear();
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid = ? ORDER BY id");
statement.setInt(1, 22188);
@@ -526,7 +526,7 @@ public class VanHalter extends Quest
{
_royalGuardHelperSpawn.clear();
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid = ? ORDER BY id");
statement.setInt(1, 22191);
@@ -594,7 +594,7 @@ public class VanHalter extends Quest
{
_guardOfAltarSpawn.clear();
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid = ? ORDER BY id");
statement.setInt(1, 32051);
@@ -668,7 +668,7 @@ public class VanHalter extends Quest
{
_vanHalterSpawn = null;
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid = ? ORDER BY id");
statement.setInt(1, 29062);
@@ -733,7 +733,7 @@ public class VanHalter extends Quest
{
_ritualOfferingSpawn = null;
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid = ? ORDER BY id");
statement.setInt(1, 32038);
@@ -799,7 +799,7 @@ public class VanHalter extends Quest
{
_ritualSacrificeSpawn = null;
try (Connection con = DatabaseFactory.getInstance().getConnection())
try (Connection con = DatabaseFactory.getConnection())
{
final PreparedStatement statement = con.prepareStatement("SELECT id, count, npc_templateid, locx, locy, locz, heading, respawn_delay FROM vanhalter_spawnlist Where npc_templateid = ? ORDER BY id");
statement.setInt(1, 22195);

View File

@@ -62,7 +62,7 @@ DROPLIST = {
def suscribe_members(st) :
clan=st.getPlayer().getClan().getClanId()
con=DatabaseFactory.getInstance().getConnection()
con=DatabaseFactory.getConnection()
offline=con.prepareStatement("SELECT obj_Id FROM characters WHERE clanid=? AND online=0")
offline.setInt(1, clan)
rs=offline.executeQuery()
@@ -86,7 +86,7 @@ def suscribe_members(st) :
def offlineMemberExit(st) :
clan=st.getPlayer().getClan().getClanId()
con=DatabaseFactory.getInstance().getConnection()
con=DatabaseFactory.getConnection()
offline=con.prepareStatement("DELETE FROM character_quests WHERE name = ? and char_id IN (SELECT obj_id FROM characters WHERE clanId =? AND online=0")
offline.setString(1, qn)
offline.setInt(2, clan)
@@ -110,7 +110,7 @@ def getLeaderVar(st, var) :
except :
pass
leaderId=st.getPlayer().getClan().getLeaderId()
con=DatabaseFactory.getInstance().getConnection()
con=DatabaseFactory.getConnection()
offline=con.prepareStatement("SELECT value FROM character_quests WHERE char_id=? AND var=? AND name=?")
offline.setInt(1, leaderId)
offline.setString(2, var)
@@ -140,7 +140,7 @@ def setLeaderVar(st, var, value) :
leader.getQuestState(qn).set(var,value)
else :
leaderId=st.getPlayer().getClan().getLeaderId()
con=DatabaseFactory.getInstance().getConnection()
con=DatabaseFactory.getConnection()
offline=con.prepareStatement("UPDATE character_quests SET value=? WHERE char_id=? AND var=? AND name=?")
offline.setString(1, value)
offline.setInt(2, leaderId)

View File

@@ -1 +1 @@
-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g
-server -Dfile.encoding=UTF-8 -Djava.util.logging.manager=com.l2jmobius.log.L2LogManager -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -XX:+AggressiveOpts -Xnoclassgc -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+UseParNewGC -XX:SurvivorRatio=8 -Xmx4g -Xms2g -Xmn1g

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@@ -1 +1 @@
-server -Xms128m -Xmx256m
-server -Dorg.slf4j.simpleLogger.log.com.zaxxer.hikari=error -Xms128m -Xmx256m