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

Dropped c3p0 in favor of HikariCP.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/accountmanager/SQLAccountManager.java
View File

@@ -49,6 +49,8 @@ public class SQLAccountManager
{
Server.serverMode = Server.MODE_LOGINSERVER;
Config.load();
DatabaseFactory.init();
while (true)
{
System.out.println("Please choose an option:");
@@ -161,7 +163,7 @@ public class SQLAccountManager
{
int count = 0;
Connection con = null;
con = DatabaseFactory.getInstance().getConnection();
con = DatabaseFactory.getConnection();
String q = "SELECT login, accessLevel FROM accounts ";
if (m.equals("1"))
{
@@ -200,7 +202,7 @@ public class SQLAccountManager
// Add to Base
Connection con = null;
con = DatabaseFactory.getInstance().getConnection();
con = DatabaseFactory.getConnection();
PreparedStatement statement = con.prepareStatement("REPLACE accounts (login, password, accessLevel) VALUES (?,?,?)");
statement.setString(1, account);
statement.setString(2, Base64.getEncoder().encodeToString(newpass));
@@ -213,7 +215,7 @@ public class SQLAccountManager
private static void changeAccountLevel(String account, String level) throws SQLException
{
Connection con = null;
con = DatabaseFactory.getInstance().getConnection();
con = DatabaseFactory.getConnection();
// Check Account Exist
PreparedStatement statement = con.prepareStatement("SELECT COUNT(*) FROM accounts WHERE login=?;");
@@ -248,7 +250,7 @@ public class SQLAccountManager
private static void deleteAccount(String account) throws SQLException
{
Connection con = null;
con = DatabaseFactory.getInstance().getConnection();
con = DatabaseFactory.getConnection();
// Check Account Exist
PreparedStatement statement = con.prepareStatement("SELECT COUNT(*) FROM accounts WHERE login=?;");

6
L2J_Mobius_C6_Interlude/java/com/l2jmobius/tools/gsregistering/BaseGameServerRegister.java
View File

@@ -69,7 +69,9 @@ public abstract class BaseGameServerRegister
Server.serverMode = Server.MODE_LOGINSERVER;
Config.load();
DatabaseFactory.init();
GameServerTable.getInstance();
try
{
GameServerTable.load();
@@ -105,7 +107,7 @@ public abstract class BaseGameServerRegister
*/
public static void unregisterGameServer(int id) throws SQLException
{
try (Connection con = DatabaseFactory.getInstance().getConnection();
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement ps = con.prepareStatement("DELETE FROM gameservers WHERE server_id = ?"))
{
@@ -121,7 +123,7 @@ public abstract class BaseGameServerRegister
*/
public static void unregisterAllGameServers() throws SQLException
{
try (Connection con = DatabaseFactory.getInstance().getConnection();
try (Connection con = DatabaseFactory.getConnection();
Statement s = con.createStatement())
{
s.executeUpdate("DELETE FROM gameservers");