From 9068227c720a4c274c9866a44ffc4e21c637d57c Mon Sep 17 00:00:00 2001 From: Lncvrt Date: Wed, 8 Oct 2025 09:59:26 -0700 Subject: [PATCH] 1.4.x backport --- config/general.php | 4 +- .../backported/1.3-beta2/getTopPlayers.php | 3 -- .../backported/1.4.0-beta1/getTopPlayers.php | 43 +++++++++++++++++ .../backported/1.4.0-beta1/loadAccount.php | 23 +++++++++ .../backported/1.4.0-beta1/loginAccount.php | 47 +++++++++++++++++++ .../backported/1.4.0-beta1/saveAccount.php | 33 +++++++++++++ database/canLoadClient.php | 5 +- database/deleteAccountProfileMessage.php | 3 -- database/getTopPlayers.php | 4 ++ database/loadAccount.php | 4 ++ database/loginAccount.php | 4 ++ database/saveAccount.php | 4 ++ 12 files changed, 168 insertions(+), 9 deletions(-) create mode 100644 database/backported/1.4.0-beta1/getTopPlayers.php create mode 100644 database/backported/1.4.0-beta1/loadAccount.php create mode 100644 database/backported/1.4.0-beta1/loginAccount.php create mode 100644 database/backported/1.4.0-beta1/saveAccount.php diff --git a/config/general.php b/config/general.php index d4a4777..3081763 100644 --- a/config/general.php +++ b/config/general.php @@ -2,5 +2,5 @@ $latestVersion = "1.8.2"; $latestBetaVersion = $latestVersion; $latestLauncherVersion = "1.1.0"; -$allowedVersions = [$latestVersion, $latestBetaVersion, "1.8.1", "1.8", "1.7.1", "1.7", "1.6.3", "1.6.2", "1.6.1", "1.6", "1.5.2", "1.5.1", "1.5.0", "1.4.1", "1.4.0"]; -$allowedDatabaseVersions = [$latestVersion, $latestBetaVersion, "1.8.1", "1.8", "1.7.1", "1.7", "1.6.3", "1.6.2", "1.6.1", "1.6", "1.5.2", "1.5.1", "1.5.0", "1.4.1", "1.4.0", "1.33", "1.3", "1.3-beta2", "1.3-beta1", "1.21", "1.2", "1.2-beta2"]; \ No newline at end of file +$allowedVersions = [$latestVersion, $latestBetaVersion, "1.8.1", "1.8", "1.7.1", "1.7", "1.6.3", "1.6.2", "1.6.1", "1.6", "1.5.2", "1.5.1", "1.5.0", "1.4.1", "1.4.0", "1.4.0-beta1"]; +$allowedDatabaseVersions = [$latestVersion, $latestBetaVersion, "1.8.1", "1.8", "1.7.1", "1.7", "1.6.3", "1.6.2", "1.6.1", "1.6", "1.5.2", "1.5.1", "1.5.0", "1.4.1", "1.4.0", "1.4.0-beta1", "1.33", "1.3", "1.3-beta2", "1.3-beta1", "1.21", "1.2", "1.2-beta2"]; \ No newline at end of file diff --git a/database/backported/1.3-beta2/getTopPlayers.php b/database/backported/1.3-beta2/getTopPlayers.php index af6ca4d..6ee62f6 100644 --- a/database/backported/1.3-beta2/getTopPlayers.php +++ b/database/backported/1.3-beta2/getTopPlayers.php @@ -1,7 +1,4 @@ prepare("SELECT username, legacy_high_score, id, save_data FROM users WHERE legacy_high_score > 0 AND banned = 0 AND leaderboardsBanned = 0 ORDER BY legacy_high_score DESC LIMIT ?"); +$stmt->bind_param("i", $request_limit); +$stmt->execute(); + +$result = $stmt->get_result(); + +if ($result->num_rows > 0) { + $topPlayers = []; + + while ($row = $result->fetch_assoc()) { + $savedata = json_decode($row['save_data'], true); + $icon = $savedata['bird']['icon'] ?? 1; + $overlay = $savedata['bird']['overlay'] ?? 0; + $topPlayers[] = base64_encode($row["username"]) . ":" . $row["legacy_high_score"] . ":" . $icon . ":" . $overlay . ":" . $row["id"]; + } + + echo implode(";", $topPlayers); +} else { + echo "-1"; +} + +$conn->close(); +?> \ No newline at end of file diff --git a/database/backported/1.4.0-beta1/loadAccount.php b/database/backported/1.4.0-beta1/loadAccount.php new file mode 100644 index 0000000..fcfbce3 --- /dev/null +++ b/database/backported/1.4.0-beta1/loadAccount.php @@ -0,0 +1,23 @@ +prepare("SELECT * FROM users WHERE token = ? AND username = ?"); +$stmt->bind_param("ss", $token, $username); +$stmt->execute(); +$result = $stmt->get_result(); + +if ($result->num_rows > 0) { + $row = $result->fetch_assoc(); + $savedata = json_decode($row['save_data'], true); + $icon = $savedata['bird']['icon'] ?? 1; + $overlay = $savedata['bird']['overlay'] ?? 0; + echo "1:" . $row['legacy_high_score'] . ":" . $icon . ":" . $overlay; +} else { + echo "-1"; +} + +$stmt->close(); +$conn->close(); \ No newline at end of file diff --git a/database/backported/1.4.0-beta1/loginAccount.php b/database/backported/1.4.0-beta1/loginAccount.php new file mode 100644 index 0000000..1ae63ae --- /dev/null +++ b/database/backported/1.4.0-beta1/loginAccount.php @@ -0,0 +1,47 @@ +prepare("SELECT * FROM users WHERE username = ?"); +$stmt->bind_param("s", $request_username); + +$stmt->execute(); + +$result = $stmt->get_result(); + +if ($result->num_rows > 0) { + while($row = $result->fetch_assoc()) { + if (password_verify($request_password, $row["password"])) { + $login_ip = getIPAddress(); + $login_time = time(); + $uid = $row['id']; + $username = $row['username']; + $highscore = $row['legacy_high_score']; + $token = $row['token']; + $savedata = json_decode($row['save_data'], true); + $icon = $savedata['bird']['icon'] ?? 1; + $overlay = $savedata['bird']['overlay'] ?? 0; + + $stmt = $conn->prepare("UPDATE users SET latest_ip = ? WHERE id = ?"); + $stmt->bind_param("si", $login_ip, $uid); + $stmt->execute(); + + echo "1:$token:$username:$uid:$highscore:$icon:$overlay"; + } else { + $stmt->close(); + $conn->close(); + exit("-2"); + } + } +} else { + $stmt->close(); + $conn->close(); + exit("-2"); +} + +$stmt->close(); +$conn->close(); + +?> \ No newline at end of file diff --git a/database/backported/1.4.0-beta1/saveAccount.php b/database/backported/1.4.0-beta1/saveAccount.php new file mode 100644 index 0000000..e06ead1 --- /dev/null +++ b/database/backported/1.4.0-beta1/saveAccount.php @@ -0,0 +1,33 @@ +prepare("SELECT * FROM users WHERE token = ? AND username = ?"); +$stmt->bind_param("ss", $request_gameSession, $request_userName); +$stmt->execute(); +$result = $stmt->get_result(); + +if ($result->num_rows > 0) { + $row = $result->fetch_assoc(); + $savedata = json_decode($row['save_data'], true); + $savedata['bird']['icon'] = $request_icon; + $savedata['bird']['overlay'] = $request_overlay; + $savedata = json_encode($savedata); + + $updateStmt = $conn->prepare("UPDATE users SET legacy_high_score = ?, save_data = ? WHERE token = ? AND username = ?"); + $updateStmt->bind_param("isss", $request_highScore, $savedata, $request_gameSession, $request_userName); + $updateStmt->execute(); + echo "1"; + $updateStmt->close(); +} else { + echo "-3"; +} + +$stmt->close(); +$conn->close(); +?> \ No newline at end of file diff --git a/database/canLoadClient.php b/database/canLoadClient.php index af5cce1..8681999 100644 --- a/database/canLoadClient.php +++ b/database/canLoadClient.php @@ -4,9 +4,12 @@ require __DIR__ . '/../incl/util.php'; setPlainHeader(); $clientVersion = $_SERVER['HTTP_CLIENTVERSION'] ?? "0"; -if (($_SERVER['HTTP_REQUESTER'] ?? "0") != "BerryDashClient" && ($_SERVER['HTTP_USER_AGENT'] ?? "0") != "BerryDashClient" && ($clientVersion == "1.4.1" || $clientVersion == "1.4.0")) { +if (($_SERVER['HTTP_REQUESTER'] ?? "0") != "BerryDashClient" && ($_SERVER['HTTP_USER_AGENT'] ?? "0") != "BerryDashClient" && ($clientVersion == "1.4.1" || $clientVersion == "1.4.0" || $clientVersion == "1.4.0-beta1")) { exitWithMessage("-1", false); } +if (isAllowedVersion($clientVersion) && $clientVersion == "1.4.0-beta1") { + exitWithMessage("1", false); +} if (isLatestVersion($clientVersion)) { echo "1"; } else if (isBetaVersion($clientVersion)) { diff --git a/database/deleteAccountProfileMessage.php b/database/deleteAccountProfileMessage.php index 8f3a6ac..c960a34 100644 --- a/database/deleteAccountProfileMessage.php +++ b/database/deleteAccountProfileMessage.php @@ -1,7 +1,4 @@