fix(skymp5-server): setting isDead to false via gamemode makes actor …

…invulnerable (#1727)
skyrim-multiplayer · Nov 1, 2023 · db5ee49 · db5ee49
1 parent c940354
commit db5ee49
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/skymp5-server/cpp/server_guest_lib/MpActor.cpp b/skymp5-server/cpp/server_guest_lib/MpActor.cpp
@@ -691,7 +691,16 @@ void MpActor::SetRespawnTime(float time)
 
 void MpActor::SetIsDead(bool isDead)
 {
-  SendAndSetDeathState(isDead, false);
+  constexpr bool kShouldTeleport = false;
+
+  if (isDead) {
+    if (IsDead() == false) {
+      SendAndSetDeathState(isDead, kShouldTeleport);
+    }
+  } else {
+    // same as SendAndSetDeathState but resets isRespawning flag
+    Respawn(kShouldTeleport);
+  }
 }
 
 void MpActor::RestoreActorValue(espm::ActorValue av, float value)