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

Make more network-events check EntitySessionEventArgs. (#6612)

Browse Source
This commit is contained in:
Leon Friedrich
2022-02-13 11:18:24 +13:00
committed by GitHub
parent 29ff523081
commit 0e6aec0e56
6 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Content.Server/Inventory/ServerInventorySystem.cs
View File

@@ -7,7 +7,7 @@ using InventoryComponent = Content.Shared.Inventory.InventoryComponent;
namespace Content.Server.Inventory
{
class ServerInventorySystem : InventorySystem
sealed class ServerInventorySystem : InventorySystem
{
public override void Initialize()
{
@@ -20,11 +20,14 @@ namespace Content.Server.Inventory
SubscribeNetworkEvent<OpenSlotStorageNetworkMessage>(OnOpenSlotStorage);
}
private void OnOpenSlotStorage(OpenSlotStorageNetworkMessage ev)
private void OnOpenSlotStorage(OpenSlotStorageNetworkMessage ev, EntitySessionEventArgs args)
{
if (TryGetSlotEntity(ev.Uid, ev.Slot, out var entityUid) && TryComp<ServerStorageComponent>(entityUid, out var storageComponent))
if (args.SenderSession.AttachedEntity is not EntityUid { Valid: true } uid)
return;
if (TryGetSlotEntity(uid, ev.Slot, out var entityUid) && TryComp<ServerStorageComponent>(entityUid, out var storageComponent))
{
storageComponent.OpenStorageUI(ev.Uid);
storageComponent.OpenStorageUI(uid);
}
}
}

4
Content.Server/Tabletop/TabletopSystem.Draggable.cs
View File

@@ -56,13 +56,13 @@ namespace Content.Server.Tabletop
transform.Coordinates = entityCoordinates;
}
private void OnDraggingPlayerChanged(TabletopDraggingPlayerChangedEvent msg)
private void OnDraggingPlayerChanged(TabletopDraggingPlayerChangedEvent msg, EntitySessionEventArgs args)
{
var dragged = msg.DraggedEntityUid;
if (!EntityManager.TryGetComponent<TabletopDraggableComponent?>(dragged, out var draggableComponent)) return;
draggableComponent.DraggingPlayer = msg.DraggingPlayer;
draggableComponent.DraggingPlayer = msg.IsDragging ? args.SenderSession.UserId : null;
if (!EntityManager.TryGetComponent<AppearanceComponent?>(dragged, out var appearance)) return;