Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Content update for NetEntities (#18935)

Browse Source
This commit is contained in:
metalgearsloth
2023-09-11 09:42:41 +10:00
committed by GitHub
parent 389c8d1a2c
commit 5a0fc68be2
526 changed files with 3058 additions and 2215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,6 +8,8 @@ namespace Content.Shared.Hands.EntitySystems;
public abstract partial class SharedHandsSystem : EntitySystem
{
[Dependency] private readonly SharedContainerSystem _container = default!;
private void InitializeDrop()
{
SubscribeLocalEvent<HandsComponent, EntRemovedFromContainerMessage>(HandleEntityRemoved);
@@ -32,10 +34,10 @@ public abstract partial class SharedHandsSystem : EntitySystem
/// </summary>
public bool CanDropHeld(EntityUid uid, Hand hand, bool checkActionBlocker = true)
{
if (hand.HeldEntity == null)
if (hand.Container?.ContainedEntity is not {} held)
return false;
if (!hand.Container!.CanRemove(hand.HeldEntity.Value, EntityManager))
if (!_container.CanRemove(held, hand.Container))
return false;
if (checkActionBlocker && !_actionBlocker.CanDrop(uid))
@@ -110,7 +112,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
/// <summary>
/// Attempts to move a held item from a hand into a container that is not another hand, without dropping it on the floor in-between.
/// </summary>
public bool TryDropIntoContainer(EntityUid uid, EntityUid entity, IContainer targetContainer, bool checkActionBlocker = true, HandsComponent? handsComp = null)
public bool TryDropIntoContainer(EntityUid uid, EntityUid entity, BaseContainer targetContainer, bool checkActionBlocker = true, HandsComponent? handsComp = null)
{
if (!Resolve(uid, ref handsComp))
return false;
@@ -121,7 +123,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
if (!CanDropHeld(uid, hand, checkActionBlocker))
return false;
if (!targetContainer.CanInsert(entity, EntityManager))
if (!_container.CanInsert(entity, targetContainer))
return false;
DoDrop(uid, hand, false, handsComp);

6
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Interactions.cs
View File

@@ -86,13 +86,13 @@ public abstract partial class SharedHandsSystem : EntitySystem
var newActiveIndex = component.SortedHands.IndexOf(component.ActiveHand.Name) + 1;
var nextHand = component.SortedHands[newActiveIndex % component.Hands.Count];
TrySetActiveHand(component.Owner, nextHand, component);
TrySetActiveHand(session.AttachedEntity.Value, nextHand, component);
}
private bool DropPressed(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
private bool DropPressed(ICommonSession? session, EntityCoordinates coords, EntityUid netEntity)
{
if (TryComp(session?.AttachedEntity, out HandsComponent? hands) && hands.ActiveHand != null)
TryDrop(session.AttachedEntity!.Value, hands.ActiveHand, coords, handsComp: hands);
TryDrop(session.AttachedEntity.Value, hands.ActiveHand, coords, handsComp: hands);
// always send to server.
return false;

2
Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs
View File

@@ -181,7 +181,7 @@ public abstract partial class SharedHandsSystem : EntitySystem
return false;
// check can insert (including raising attempt events).
return handContainer.CanInsert(entity, EntityManager);
return _containerSystem.CanInsert(entity, handContainer);
}
/// <summary>