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

Bugfixes (#123)

Browse Source 
* - fix: Fix summon rune pulling.

* - fix: Gulagged antag fix.

* - fix: Fix thieves failing objectives on round end.

* - fix: Crossbow fix.
This commit is contained in:
Aviu00
2024-02-25 16:02:11 +09:00
committed by GitHub
parent aea2815c92
commit 3d415ddd00
7 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Content.Server/Antag/AntagSelectionSystem.cs
View File

@@ -11,6 +11,7 @@ using Robust.Shared.Random;
using Robust.Shared.Map;
using System.Numerics;
using Content.Server._Miracle.Components;
using Content.Server._Miracle.GulagSystem;
using Content.Shared.Inventory;
using Content.Server.Storage.EntitySystems;
using Robust.Shared.Audio;
@@ -48,6 +49,7 @@ public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
[Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
[Dependency] private readonly RoleSystem _roles = default!; // WD
[Dependency] private readonly SharedPlayerSystem _sharedPlayerSystem = default!; // WD
[Dependency] private readonly GulagSystem _gulag = default!; // WD
/// <summary>
/// Attempts to start the game rule by checking if there are enough players in lobby and readied.
@@ -102,12 +104,14 @@ public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
chosen = new List<EntityUid>();
foreach (var player in allPlayers)
{
if (_gulag.IsUserGulaged(player.UserId, out _)) // WD
continue;
if (includeHeads == false)
{
// WD START
if (!_mindSystem.TryGetMind(player, out _, out var mind) ||
mind.OwnedEntity is not { } ownedEntity || HasComp<CommandStaffComponent>(ownedEntity) ||
HasComp<GulagBoundComponent>(ownedEntity))
mind.OwnedEntity is not { } ownedEntity || HasComp<CommandStaffComponent>(ownedEntity))
continue;
// WD END
@@ -175,6 +179,9 @@ public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
foreach (var player in candidates.Keys)
{
if (_gulag.IsUserGulaged(player.UserId, out _)) // WD
continue;
if (_sharedPlayerSystem.ContentData(player) is not {Mind: { } mindId} || _roles.MindIsAntagonist(mindId))
continue;
@@ -182,11 +189,6 @@ public sealed class AntagSelectionSystem : GameRuleSystem<GameRuleComponent>
if (!_jobs.CanBeAntag(player))
continue;
// Gulag
if (!_mindSystem.TryGetMind(player, out _, out var mind) ||
mind.OwnedEntity is not { } ownedEntity || HasComp<GulagBoundComponent>(ownedEntity))
continue;
// Latejoin
if (player.AttachedEntity != null && pendingQuery.HasComponent(player.AttachedEntity.Value))
continue;