Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Фикс блока ближних атак (#801)

Browse Source
This commit is contained in:
BIGZi0348
2024-12-02 22:30:18 +03:00
committed by GitHub
parent 5e1db9a02e b418540382
commit ebdb8fa829
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Content.Shared/_White/Blocking/MeleeBlockSystem.cs
View File

@@ -11,6 +11,7 @@ using Content.Shared.Weapons.Melee;
using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Melee.Events;
using Robust.Shared.Audio.Systems; using Robust.Shared.Audio.Systems;
using Robust.Shared.Timing; using Robust.Shared.Timing;
using Content.Shared.Mobs.Systems;
namespace Content.Shared._White.Blocking; namespace Content.Shared._White.Blocking;
@@ -21,6 +22,7 @@ public sealed class MeleeBlockSystem : EntitySystem
[Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly SharedAudioSystem _audio = default!;
[Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
[Dependency] private readonly StatusEffectsSystem _statusEffect = default!; [Dependency] private readonly StatusEffectsSystem _statusEffect = default!;
[Dependency] private readonly MobStateSystem _mobStateSystem = default!;
public override void Initialize() public override void Initialize()
{ {
@@ -76,6 +78,9 @@ public sealed class MeleeBlockSystem : EntitySystem
if (TryComp(uid.Value, out ItemToggleComponent? toggle) && !toggle.Activated) if (TryComp(uid.Value, out ItemToggleComponent? toggle) && !toggle.Activated)
return; return;
if (!_mobStateSystem.IsAlive(ent))
return;
_audio.PlayPredicted(block.BlockSound, ent, args.Attacker); _audio.PlayPredicted(block.BlockSound, ent, args.Attacker);
_popupSystem.PopupPredicted(Loc.GetString("melee-block-event-blocked"), ent, args.Attacker); _popupSystem.PopupPredicted(Loc.GetString("melee-block-event-blocked"), ent, args.Attacker);
_damageable.TryChangeDamage(uid.Value, args.Damage); _damageable.TryChangeDamage(uid.Value, args.Damage);