Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(skymp5-server): setting isDead to false via gamemode makes actor invulnerable #1727

Merged
merged 1 commit into from
Nov 1, 2023
Merged

fix(skymp5-server): setting isDead to false via gamemode makes actor invulnerable #1727

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion skymp5-server/cpp/server_guest_lib/MpActor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading