Status effect refactor (#4868)

* Oops! All Changes In One Commit

* try desperately to fix prediction issues and fail

* oops

* test

* actually fixes prediction issues

* port jittering to status effect

* default merge behavior + alert cooldown stuff

* silly test issue

* zabloing

* address reviews
This commit is contained in:
mirrorcult
2021-10-15 14:45:04 -07:00
committed by GitHub
parent 51578304f1
commit ae1ce0b31c
36 changed files with 811 additions and 511 deletions

View File

@@ -136,8 +136,7 @@ namespace Content.Server.DoAfter
}
if (EventArgs.BreakOnStun &&
entityManager.TryGetComponent(EventArgs.User, out StunnableComponent? stunnableComponent) &&
stunnableComponent.Stunned)
entityManager.HasComponent<StunnedComponent>(EventArgs.User))
{
return true;
}