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.Client/Storage/StorageBoundUserInterface.cs
View File

@@ -54,7 +54,7 @@ namespace Content.Client.Storage
if (args.Event.Function == EngineKeyFunctions.UIClick)
{
SendMessage(new StorageInteractWithItemEvent(entity));
SendMessage(new StorageInteractWithItemEvent(EntMan.GetNetEntity(entity)));
}
else if (EntMan.EntityExists(entity))
{
@@ -76,11 +76,11 @@ namespace Content.Client.Storage
else if (args.Function == ContentKeyFunctions.ActivateItemInWorld)
{
EntMan.EntityNetManager?.SendSystemNetworkMessage(
new InteractInventorySlotEvent(entity, altInteract: false));
new InteractInventorySlotEvent(EntMan.GetNetEntity(entity), altInteract: false));
}
else if (args.Function == ContentKeyFunctions.AltActivateItemInWorld)
{
EntMan.RaisePredictiveEvent(new InteractInventorySlotEvent(entity, altInteract: true));
EntMan.RaisePredictiveEvent(new InteractInventorySlotEvent(EntMan.GetNetEntity(entity), altInteract: true));
}
else
{

10
Content.Client/Storage/Systems/StorageSystem.cs
View File

@@ -19,18 +19,20 @@ public sealed class StorageSystem : EntitySystem
/// <param name="msg"></param>
public void HandleAnimatingInsertingEntities(AnimateInsertingEntitiesEvent msg)
{
if (!TryComp(msg.Storage, out ClientStorageComponent? storage))
var store = GetEntity(msg.Storage);
if (!HasComp<ClientStorageComponent>(store))
return;
TryComp(msg.Storage, out TransformComponent? transformComp);
TryComp(store, out TransformComponent? transformComp);
for (var i = 0; msg.StoredEntities.Count > i; i++)
{
var entity = msg.StoredEntities[i];
var entity = GetEntity(msg.StoredEntities[i]);
var initialPosition = msg.EntityPositions[i];
if (EntityManager.EntityExists(entity) && transformComp != null)
{
ReusableAnimations.AnimateEntityPickup(entity, initialPosition, transformComp.LocalPosition, msg.EntityAngles[i], EntityManager);
ReusableAnimations.AnimateEntityPickup(entity, GetCoordinates(initialPosition), transformComp.LocalPosition, msg.EntityAngles[i], EntityManager);
}
}
}

2
Content.Client/Storage/UI/StorageWindow.cs
View File

@@ -88,7 +88,7 @@ namespace Content.Client.Storage.UI
/// </summary>
public void BuildEntityList(StorageBoundUserInterfaceState state)
{
var list = state.StoredEntities.ConvertAll(uid => new EntityListData(uid));
var list = state.StoredEntities.ConvertAll(nent => new EntityListData(_entityManager.GetEntity(nent)));
EntityList.PopulateList(list);
//Sets information about entire storage container current capacity