From fcd03df1f86ed5146c76737afdbc1d45cb5197a5 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sun, 8 Mar 2026 18:50:43 +0000 Subject: [PATCH] Resolve conflicts: adopt base branch error message wording in SaveBuffs Co-authored-by: Valorith <76063792+Valorith@users.noreply.github.com> --- zone/zonedb.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zone/zonedb.cpp b/zone/zonedb.cpp index 9f0fa0033..61229916c 100644 --- a/zone/zonedb.cpp +++ b/zone/zonedb.cpp @@ -2940,7 +2940,7 @@ void ZoneDatabase::SaveBuffs(Client *client) if (saved_count < static_cast(v.size())) { database.TransactionRollback(); 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(),