Skip to content

Ensure shields without toggles can still block damage #5697

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

Open
BarryNorfolk wants to merge 1 commit into
base: master
Choose a base branch
from
+1 −1
Open

Ensure shields without toggles can still block damage #5697

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
2 changes: 1 addition & 1 deletion Content.Shared/Blocking/BlockingSystem.User.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ private void OnUserDamageModified(EntityUid uid, BlockingUserComponent component
return;

// Delta V - Begin Fix Toggleable Shields always blocking
if (!TryComp<ItemToggleComponent>(item, out var toggleComp) || !toggleComp.Activated)
if (TryComp<ItemToggleComponent>(item, out var toggleComp) && !toggleComp.Activated)
return;
// Delta V - End

Expand Down
Loading