tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PAIs will no longer get uplinks instead of traitors when a player is selected as an traitor (#41069)

Browse Source 
* Fix bug, add logging

* Fixes
This commit is contained in:
beck-thompson
2025-10-23 22:47:05 -07:00
committed by GitHub
parent 8600286ed3
commit 7a811c229b
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
View File

@@ -170,12 +170,18 @@ public sealed class TraitorRuleSystem : GameRuleSystem<TraitorRuleComponent>
Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#")))); Loc.GetString("traitor-role-uplink-code-short", ("code", string.Join("-", code).Replace("sharp", "#"))));
return (code, briefing); return (code, briefing);
} }
Log.Error($"MakeTraitor {ToPrettyString(traitor)} failed to generate an uplink code on {ToPrettyString(pda)}.");
} }
else if (pda is null && uplinked) else if (pda is null && uplinked)
{ {
Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is implant"); Log.Debug($"MakeTraitor {ToPrettyString(traitor)} - Uplink is implant");
briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short"); briefing += "\n" + Loc.GetString("traitor-role-uplink-implant-short");
} }
else
{
Log.Error($"MakeTraitor failed on {ToPrettyString(traitor)} - No uplink could be added");
}
return (null, briefing); return (null, briefing);
} }

14
Content.Server/Traitor/Uplink/UplinkSystem.cs
View File

@@ -102,7 +102,10 @@ public sealed class UplinkSystem : EntitySystem
var implant = _subdermalImplant.AddImplant(user, FallbackUplinkImplant); var implant = _subdermalImplant.AddImplant(user, FallbackUplinkImplant);
if (!HasComp<StoreComponent>(implant)) if (!HasComp<StoreComponent>(implant))
{
Log.Error($"Implant does not have the store component {implant}");
return false; return false;
}
SetUplink(user, implant.Value, balance, giveDiscounts); SetUplink(user, implant.Value, balance, giveDiscounts);
return true; return true;
@@ -117,20 +120,19 @@ public sealed class UplinkSystem : EntitySystem
// Try to find PDA in inventory // Try to find PDA in inventory
if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator)) if (_inventorySystem.TryGetContainerSlotEnumerator(user, out var containerSlotEnumerator))
{ {
while (containerSlotEnumerator.MoveNext(out var pdaUid)) while (containerSlotEnumerator.MoveNext(out var containerSlot))
{ {
if (!pdaUid.ContainedEntity.HasValue) var pdaUid = containerSlot.ContainedEntity;
continue;
if (HasComp<PdaComponent>(pdaUid.ContainedEntity.Value) || HasComp<StoreComponent>(pdaUid.ContainedEntity.Value)) if (HasComp<PdaComponent>(pdaUid) && HasComp<StoreComponent>(pdaUid))
return pdaUid.ContainedEntity.Value; return pdaUid;
} }
} }
// Also check hands // Also check hands
foreach (var item in _handsSystem.EnumerateHeld(user)) foreach (var item in _handsSystem.EnumerateHeld(user))
{ {
if (HasComp<PdaComponent>(item) || HasComp<StoreComponent>(item)) if (HasComp<PdaComponent>(item) && HasComp<StoreComponent>(item))
return item; return item;
} }