From 7a20f7dce9b3573fa87bb11f5f2ef94add1214a0 Mon Sep 17 00:00:00 2001 From: hyperkilljoy Date: Wed, 25 Dec 2024 11:35:06 -0500 Subject: [PATCH 1/5] CirnoPKv2 --- .gitignore | 1 + server/connections.conf | 2 +- server/default.conf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4312ea12e..7a680af96 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,7 @@ server/avatars/*.png server/*.jar server/out/ server/local.conf +server/connections.conf etc/logs/mariadb/* !etc/logs/mariadb/.gitsave diff --git a/server/connections.conf b/server/connections.conf index c23f1e459..7b6fec37b 100644 --- a/server/connections.conf +++ b/server/connections.conf @@ -3,7 +3,7 @@ db_type: sqlite # This may be either mysql or sqlite. If mysql, the connection d mysql: db_host: localhost:3306 db_user: root - db_pass: root + db_pass: root2 db_table_prefix: # leave blank unless needed ssl: diff --git a/server/default.conf b/server/default.conf index bb7f301d2..ae0baa528 100644 --- a/server/default.conf +++ b/server/default.conf @@ -3,7 +3,7 @@ # Create a copy of this file named local.conf to override these settings. database: - db_name: preservation + db_name: cirnopkv2 world: server_name: Runescape # Shown in the login prompt and when you hover over a player in the friends list From 2950a8708d0f46062a9448e107fc75f022e1e899 Mon Sep 17 00:00:00 2001 From: hyperkilljoy Date: Sat, 31 May 2025 17:24:04 -0400 Subject: [PATCH 2/5] Clans didn't save properly This fixes clans so that they save. --- .../com/openrsc/server/database/impl/mysql/MySqlQueries.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/openrsc/server/database/impl/mysql/MySqlQueries.java b/server/src/com/openrsc/server/database/impl/mysql/MySqlQueries.java index f6acd0ab6..e0d33ba0d 100644 --- a/server/src/com/openrsc/server/database/impl/mysql/MySqlQueries.java +++ b/server/src/com/openrsc/server/database/impl/mysql/MySqlQueries.java @@ -183,7 +183,7 @@ public MySqlQueries(final Server server) { groundItems = "SELECT `id`, `x`, `y`, `amount`, `respawn` FROM `" + PREFIX + "grounditems`"; inUseItemIds = "SELECT `itemID` FROM `" + PREFIX + "itemstatuses`"; - clans = "SELECT `id`, `name`, `tag`, `kick_setting`, `invite_setting`, `allow_search_join`, `clan_points` FROM `" + PREFIX + "clan`"; + clans = "SELECT `id`, `name`, `tag`, `kick_setting`, `invite_setting`, `allow_search_join`, `clan_points` FROM `" + (PREFIX + "clan") + "`"; clanMembers = "SELECT `username`, `rank`, `kills`, `deaths` FROM `" + PREFIX + "clan_players` WHERE `clan_id`=?"; newClan = "INSERT INTO `" + PREFIX + "clan`(`name`, `tag`, `leader`) VALUES (?,?,?)"; saveClanMember = "INSERT INTO `" + PREFIX + "clan_players`(`clan_id`, `username`, `rank`, `kills`, `deaths`) VALUES (?,?,?,?,?)"; From 0974154d32a2d30efc18c67c4fc03390d0db3525 Mon Sep 17 00:00:00 2001 From: hyperkilljoy Date: Sun, 1 Jun 2025 01:34:33 -0400 Subject: [PATCH 3/5] Revert "Merge branch 'develop' of https://github.com/hyperkilljoy/Core-Framework into develop" This reverts commit e9c454e34cbbe961e2aea76b0804b91fac13cb53, reversing changes made to 2950a8708d0f46062a9448e107fc75f022e1e899. --- .gitignore | 1 - server/connections.conf | 2 +- server/default.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7a680af96..4312ea12e 100644 --- a/.gitignore +++ b/.gitignore @@ -93,7 +93,6 @@ server/avatars/*.png server/*.jar server/out/ server/local.conf -server/connections.conf etc/logs/mariadb/* !etc/logs/mariadb/.gitsave diff --git a/server/connections.conf b/server/connections.conf index 7b6fec37b..c23f1e459 100644 --- a/server/connections.conf +++ b/server/connections.conf @@ -3,7 +3,7 @@ db_type: sqlite # This may be either mysql or sqlite. If mysql, the connection d mysql: db_host: localhost:3306 db_user: root - db_pass: root2 + db_pass: root db_table_prefix: # leave blank unless needed ssl: diff --git a/server/default.conf b/server/default.conf index ae0baa528..bb7f301d2 100644 --- a/server/default.conf +++ b/server/default.conf @@ -3,7 +3,7 @@ # Create a copy of this file named local.conf to override these settings. database: - db_name: cirnopkv2 + db_name: preservation world: server_name: Runescape # Shown in the login prompt and when you hover over a player in the friends list From 676adf83cdb0836d262dd953ab53e9bb69250cb9 Mon Sep 17 00:00:00 2001 From: hyperkilljoy Date: Sun, 1 Jun 2025 01:35:21 -0400 Subject: [PATCH 4/5] Reapply "Merge branch 'develop' of https://github.com/hyperkilljoy/Core-Framework into develop" This reverts commit 0974154d32a2d30efc18c67c4fc03390d0db3525. --- .gitignore | 1 + server/connections.conf | 2 +- server/default.conf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4312ea12e..7a680af96 100644 --- a/.gitignore +++ b/.gitignore @@ -93,6 +93,7 @@ server/avatars/*.png server/*.jar server/out/ server/local.conf +server/connections.conf etc/logs/mariadb/* !etc/logs/mariadb/.gitsave diff --git a/server/connections.conf b/server/connections.conf index c23f1e459..7b6fec37b 100644 --- a/server/connections.conf +++ b/server/connections.conf @@ -3,7 +3,7 @@ db_type: sqlite # This may be either mysql or sqlite. If mysql, the connection d mysql: db_host: localhost:3306 db_user: root - db_pass: root + db_pass: root2 db_table_prefix: # leave blank unless needed ssl: diff --git a/server/default.conf b/server/default.conf index bb7f301d2..ae0baa528 100644 --- a/server/default.conf +++ b/server/default.conf @@ -3,7 +3,7 @@ # Create a copy of this file named local.conf to override these settings. database: - db_name: preservation + db_name: cirnopkv2 world: server_name: Runescape # Shown in the login prompt and when you hover over a player in the friends list From 7e47ce5f69f27fd7a8d9e9d8743b117dea1f89f1 Mon Sep 17 00:00:00 2001 From: hyperkilljoy Date: Sun, 1 Jun 2025 01:54:03 -0400 Subject: [PATCH 5/5] Undo my changes Undoing my changes --- .gitignore | 1 - server/connections.conf | 2 +- server/default.conf | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7a680af96..4312ea12e 100644 --- a/.gitignore +++ b/.gitignore @@ -93,7 +93,6 @@ server/avatars/*.png server/*.jar server/out/ server/local.conf -server/connections.conf etc/logs/mariadb/* !etc/logs/mariadb/.gitsave diff --git a/server/connections.conf b/server/connections.conf index 7b6fec37b..c23f1e459 100644 --- a/server/connections.conf +++ b/server/connections.conf @@ -3,7 +3,7 @@ db_type: sqlite # This may be either mysql or sqlite. If mysql, the connection d mysql: db_host: localhost:3306 db_user: root - db_pass: root2 + db_pass: root db_table_prefix: # leave blank unless needed ssl: diff --git a/server/default.conf b/server/default.conf index ae0baa528..bb7f301d2 100644 --- a/server/default.conf +++ b/server/default.conf @@ -3,7 +3,7 @@ # Create a copy of this file named local.conf to override these settings. database: - db_name: cirnopkv2 + db_name: preservation world: server_name: Runescape # Shown in the login prompt and when you hover over a player in the friends list