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

Fix references to obsolete TryGetContainingContainer override (#34912)

Browse Source
This commit is contained in:
TemporalOroboros
2025-02-10 21:08:17 -08:00
committed by GitHub
parent 224a95b103
commit 66ff1aa37d
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Explosion/EntitySystems/TriggerSystem.cs
View File

@@ -126,7 +126,7 @@ namespace Content.Server.Explosion.EntitySystems
private void HandleShockTrigger(Entity<ShockOnTriggerComponent> shockOnTrigger, ref TriggerEvent args) private void HandleShockTrigger(Entity<ShockOnTriggerComponent> shockOnTrigger, ref TriggerEvent args)
{ {
if (!_container.TryGetContainingContainer(shockOnTrigger, out var container)) if (!_container.TryGetContainingContainer(shockOnTrigger.Owner, out var container))
return; return;
var containerEnt = container.Owner; var containerEnt = container.Owner;

2
Content.Shared/Inventory/InventorySystem.Helpers.cs
View File

@@ -40,7 +40,7 @@ public partial class InventorySystem
/// </summary> /// </summary>
public bool TryGetContainingSlot(Entity<TransformComponent?, MetaDataComponent?> entity, [NotNullWhen(true)] out SlotDefinition? slot) public bool TryGetContainingSlot(Entity<TransformComponent?, MetaDataComponent?> entity, [NotNullWhen(true)] out SlotDefinition? slot)
{ {
if (!_containerSystem.TryGetContainingContainer(entity.Owner, out var container, entity.Comp2, entity.Comp1)) if (!_containerSystem.TryGetContainingContainer(entity, out var container))
{ {
slot = null; slot = null;
return false; return false;