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

Stop terminating entities from being removed from containers (#22232)

Browse Source
This commit is contained in:
Leon Friedrich
2023-12-09 20:00:53 -05:00
committed by GitHub
parent 8bc4d2ab7a
commit 5da332f75e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Drop.cs
View File

@@ -177,6 +177,9 @@ public abstract partial class SharedHandsSystem
var entity = hand.Container.ContainedEntity.Value; var entity = hand.Container.ContainedEntity.Value;
if (TerminatingOrDeleted(uid) || TerminatingOrDeleted(entity))
return;
if (!hand.Container.Remove(entity, EntityManager)) if (!hand.Container.Remove(entity, EntityManager))
{ {
Log.Error($"Failed to remove {ToPrettyString(entity)} from users hand container when dropping. User: {ToPrettyString(uid)}. Hand: {hand.Name}."); Log.Error($"Failed to remove {ToPrettyString(entity)} from users hand container when dropping. User: {ToPrettyString(uid)}. Hand: {hand.Name}.");

6
Content.Shared/Inventory/InventorySystem.Equip.cs
View File

@@ -331,6 +331,10 @@ public abstract partial class InventorySystem
bool force = false, bool predicted = false, InventoryComponent? inventory = null, ClothingComponent? clothing = null) bool force = false, bool predicted = false, InventoryComponent? inventory = null, ClothingComponent? clothing = null)
{ {
removedItem = null; removedItem = null;
if (TerminatingOrDeleted(target))
return false;
if (!Resolve(target, ref inventory, false)) if (!Resolve(target, ref inventory, false))
{ {
if(!silent && _gameTiming.IsFirstTimePredicted) if(!silent && _gameTiming.IsFirstTimePredicted)
@@ -347,7 +351,7 @@ public abstract partial class InventorySystem
removedItem = slotContainer.ContainedEntity; removedItem = slotContainer.ContainedEntity;
if (!removedItem.HasValue) if (!removedItem.HasValue || TerminatingOrDeleted(removedItem.Value))
return false; return false;
if (!force && !CanUnequip(actor, target, slot, out var reason, slotContainer, slotDefinition, inventory)) if (!force && !CanUnequip(actor, target, slot, out var reason, slotContainer, slotDefinition, inventory))