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

Fix non peaceful round end

Browse Source
This commit is contained in:
Aviu00
2024-01-11 07:46:24 +03:00
parent 58ebc489ce
commit 7b16d10902
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/White/NonPeacefulRoundEnd/NonPeacefulRoundEndSystem.cs
View File

@@ -1,16 +1,14 @@
using System.Linq; using System.Linq;
using Content.Server.Chat.Managers; using Content.Server.Chat.Managers;
using Content.Server.GameTicking; using Content.Server.GameTicking;
using Content.Server.Traits.Assorted;
using Content.Shared.CombatMode.Pacification; using Content.Shared.CombatMode.Pacification;
using Content.Shared.GameTicking;
using Content.Shared.Hands.Components; using Content.Shared.Hands.Components;
using Content.Shared.Hands.EntitySystems; using Content.Shared.Hands.EntitySystems;
using Content.Shared.Humanoid; using Content.Shared.Humanoid;
using Content.Shared.White; using Content.Shared.White;
using Content.Shared.White.NonPeacefulRoundEnd; using Content.Shared.White.NonPeacefulRoundEnd;
using Robust.Server.Audio;
using Robust.Server.Player; using Robust.Server.Player;
using Robust.Shared.Audio;
using Robust.Shared.Configuration; using Robust.Shared.Configuration;
using Robust.Shared.Player; using Robust.Shared.Player;
using Robust.Shared.Prototypes; using Robust.Shared.Prototypes;
@@ -27,7 +25,7 @@ public sealed class NonPeacefulRoundEndSystem : EntitySystem
[Dependency] private readonly IRobustRandom _robustRandom = default!; [Dependency] private readonly IRobustRandom _robustRandom = default!;
[Dependency] private readonly IEntityManager _entityManager = default!; [Dependency] private readonly IEntityManager _entityManager = default!;
[Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IChatManager _chatManager = default!;
[Dependency] private readonly SharedAudioSystem _sharedAudioSystem = default!; [Dependency] private readonly AudioSystem _sharedAudioSystem = default!;
private NonPeacefulRoundItemsPrototype _nonPeacefulRoundItemsPrototype = default!; private NonPeacefulRoundItemsPrototype _nonPeacefulRoundItemsPrototype = default!;
@@ -58,8 +56,6 @@ public sealed class NonPeacefulRoundEndSystem : EntitySystem
if (!session.AttachedEntity.HasValue) continue; if (!session.AttachedEntity.HasValue) continue;
RemComp<PacifiedComponent>(session.AttachedEntity.Value); RemComp<PacifiedComponent>(session.AttachedEntity.Value);
RemComp<PacifistComponent>(session.AttachedEntity.Value);
GiveItem(session.AttachedEntity.Value); GiveItem(session.AttachedEntity.Value);
} }