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

Fixes inventories and throwing. (#133)

Browse Source
This commit is contained in:
Acruid
2018-12-13 05:49:05 -08:00
committed by Pieter-Jan Briers
parent 37df61113e
commit 69946c79d8
4 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -127,20 +127,17 @@ namespace Content.Server.GameObjects
{
_ensureInitialCalculated();
Logger.DebugS("Storage", "Storage (UID {0}) attacked by user (UID {1}) with entity (UID {2}).", Owner.Uid, user.Uid, attackwith.Uid);
var hands = user.GetComponent<HandsComponent>();
if (!user.TryGetComponent(out HandsComponent hands))
return false;
//Check that we can drop the item from our hands first otherwise we obviously cant put it inside
if (hands.Drop(hands.ActiveIndex, null))
if (hands.Drop(hands.ActiveIndex))
{
var inserted = Insert(attackwith);
if (inserted)
if (Insert(attackwith))
{
return true;
}
else
{
//Return the object to the hand since its too big or something like that
hands.PutInHand(attackwith.GetComponent<ItemComponent>());
}
}
return false;
}