fix(skymp5-server): reset timer id on resolve in RegisterForSingleUpd…

…ate (#2336)
skyrim-multiplayer · Feb 12, 2025 · 9886482 · 9886482
1 parent 72614e6
commit 9886482
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/skymp5-server/cpp/server_guest_lib/script_classes/PapyrusForm.cpp b/skymp5-server/cpp/server_guest_lib/script_classes/PapyrusForm.cpp
@@ -36,9 +36,12 @@ VarValue PapyrusForm::RegisterForSingleUpdate(
       auto promise = worldState->SetTimer(time, &timerId);
       uint32_t formId = form->GetFormId();
       promise.Then([form, formId, worldState](const Viet::Void&) {
-        if (form == worldState->LookupFormById(formId).get()) {
-          form->Update();
+        if (form != worldState->LookupFormById(formId).get()) {
+          spdlog::error("form mismatch on timer resolve: formId={:x}", formId);
+          return;
         }
+        form->SetSingleUpdateTimerId(std::nullopt);
+        form->Update();
       });
 
       form->SetSingleUpdateTimerId(timerId);