From 1c7a914083ca08f27e0ed9ccfd8f398f26e9ea4e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:44:09 +0000
Subject: [PATCH 2/5] Add vcpkg download cache and retry steps to linux CI job

Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
---
 .github/workflows/build.yaml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 7ad7003ef..bc5246131 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -52,6 +52,33 @@ jobs:
       - name: Mark workspace safe
         run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
 
+      - name: Cache vcpkg downloads
+        uses: actions/cache@v4
+        with:
+          path: submodules/vcpkg/downloads
+          key: ${{ runner.os }}-vcpkg-downloads-${{ hashFiles('submodules/vcpkg/vcpkg.json', 'submodules/vcpkg/ports/**', 'submodules/vcpkg/versions/**') }}
+          restore-keys: |
+            ${{ runner.os }}-vcpkg-downloads-
+
+      - name: vcpkg install (retry)
+        working-directory: ${{ github.workspace }}
+        run: |
+          set -e
+          cd submodules/vcpkg
+          ./bootstrap-vcpkg.sh -disableMetrics
+
+          for i in 1 2 3 4 5; do
+            echo "vcpkg install attempt $i..."
+            if ./vcpkg install --triplet x64-linux; then
+              exit 0
+            fi
+            echo "vcpkg install failed; sleeping before retry..."
+            sleep $((i * 10))
+          done
+
+          echo "vcpkg install failed after retries"
+          exit 1
+
       - name: Build
         working-directory: ${{ github.workspace }}
         run: |

From 15c15f0687f34fd7279d7a295b08b9786fd52693 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 15:46:48 +0000
Subject: [PATCH 4/5] Fix false error log: use < instead of != when checking
 ReplaceMany result in SaveBuffs

Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
---
 zone/zonedb.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp
index 91c466d20..6a1607086 100644
--- a/zone/zonedb.cpp
+++ b/zone/zonedb.cpp
@@ -2935,9 +2935,9 @@ void ZoneDatabase::SaveBuffs(Client *client)
 
 	if (!v.empty()) {
 		const auto saved_count = CharacterBuffsRepository::ReplaceMany(database, v);
-		if (saved_count != static_cast<int>(v.size())) {
+		if (saved_count < static_cast<int>(v.size())) {
 			LogError(
-				"Failed to save all buffs for character [{}] [{}]. Expected [{}] rows, saved [{}]. Verify the `character_buffs` schema is up to date.",
+				"Failed to save all buffs for character [{}] [{}]. Expected at least [{}] rows saved, got [{}]. Verify the `character_buffs` schema is up to date.",
 				client->GetCleanName(),
 				client->CharacterID(),
 				v.size(),

From 43d3a631a0860ecb64834ac88c0e5b627cbe3096 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Sun, 8 Mar 2026 17:58:47 +0000
Subject: [PATCH 5/5] Fix build: use EQ::versions::ClientVersion::RoF2 in
 cli_zone_state test

Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com>
---
 zone/cli/tests/cli_zone_state.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zone/cli/tests/cli_zone_state.cpp b/zone/cli/tests/cli_zone_state.cpp
index f3c0833e6..1eb391a81 100644
--- a/zone/cli/tests/cli_zone_state.cpp
+++ b/zone/cli/tests/cli_zone_state.cpp
@@ -895,7 +895,7 @@ inline void TestClientBuffPersistence()
 	Client loader;
 	loader.SetCharacterId(test_character_id);
 	loader.SetName("buff-persistence-load");
-	loader.SetClientVersion(ClientVersion::RoF2);
+	loader.SetClientVersion(EQ::versions::ClientVersion::RoF2);
 	database.LoadBuffs(&loader);
 
 	auto loaded_buffs = loader.GetBuffs();