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

Remove IDropped (#7075)

Browse Source
This commit is contained in:
Leon Friedrich
2022-03-13 21:47:28 +13:00
committed by GitHub
parent 4444d099d1
commit e3ead6a3ba
10 changed files with 42 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Shared/Hands/Components/SharedHandsComponent.cs
View File

@@ -4,6 +4,7 @@ using System.Diagnostics.CodeAnalysis;
using System.Linq;
using Content.Shared.ActionBlocker;
using Content.Shared.Interaction;
using Content.Shared.Interaction.Events;
using Content.Shared.Item;
using Robust.Shared.Containers;
using Robust.Shared.GameObjects;
@@ -635,12 +636,15 @@ namespace Content.Shared.Hands.Components
}
/// <summary>
/// Puts an item any hand, prefering the active hand, or puts it on the floor under the player.
/// Puts an item any hand, preferring the active hand, or puts it on the floor under the player.
/// </summary>
public void PutInHandOrDrop(EntityUid entity, bool checkActionBlocker = true)
{
if (!PutInHand(entity, checkActionBlocker))
_entMan.GetComponent<TransformComponent>(entity).Coordinates = _entMan.GetComponent<TransformComponent>(Owner).Coordinates;
if (PutInHand(entity, checkActionBlocker))
return;
_entMan.GetComponent<TransformComponent>(entity).AttachParentToContainerOrGrid(_entMan);
_entMan.EventBus.RaiseLocalEvent(entity, new DroppedEvent(Owner));
}
public void PutInHandOrDrop(SharedItemComponent item, bool checkActionBlocker = true)
@@ -648,7 +652,6 @@ namespace Content.Shared.Hands.Components
PutInHandOrDrop(item.Owner, checkActionBlocker);
}
/// <summary>
/// Tries to pick up an entity into the active hand. If it cannot, tries to pick up the entity into each other hand.
/// </summary>