Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

6
Content.Server/Hands/Systems/HandsSystem.cs
View File

@@ -105,7 +105,7 @@ namespace Content.Server.Hands.Systems
if (exclude != null)
filter = filter.RemoveWhereAttachedEntity(entity => entity == exclude);
RaiseNetworkEvent(new PickupAnimationEvent(item, initialPosition, finalPosition, initialAngle), filter);
RaiseNetworkEvent(new PickupAnimationEvent(GetNetEntity(item), GetNetCoordinates(initialPosition), finalPosition, initialAngle), filter);
}
protected override void HandleEntityRemoved(EntityUid uid, HandsComponent hands, EntRemovedFromContainerMessage args)
@@ -178,7 +178,7 @@ namespace Content.Server.Hands.Systems
#endregion
#region interactions
private bool HandleThrowItem(ICommonSession? session, EntityCoordinates coords, EntityUid uid)
private bool HandleThrowItem(ICommonSession? session, EntityCoordinates coordinates, EntityUid entity)
{
if (session is not IPlayerSession playerSession)
return false;
@@ -201,7 +201,7 @@ namespace Content.Server.Hands.Systems
throwEnt = splitStack.Value;
}
var direction = coords.ToMapPos(EntityManager) - Transform(player).WorldPosition;
var direction = coordinates.ToMapPos(EntityManager) - Transform(player).WorldPosition;
if (direction == Vector2.Zero)
return true;