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

SubscribeEvent() has been split into SubscribeNetworkEvent() and SubscribeLocalEvent() methods on EntitySystem.

Browse Source 
Most methods on EntityEventBus now require callers to specify the source (Local or Network) of the events.
This commit is contained in:
Acruid
2020-02-19 17:08:59 -08:00
parent e719745b10
commit ee6eec9c40
18 changed files with 42 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Client/GameObjects/EntitySystems/ExamineSystem.cs
View File

@@ -111,7 +111,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
_requestCancelTokenSource = new CancellationTokenSource();
response =
await AwaitNetMessage<ExamineSystemMessages.ExamineInfoResponseMessage>(_requestCancelTokenSource
await AwaitNetworkEvent<ExamineSystemMessages.ExamineInfoResponseMessage>(_requestCancelTokenSource
.Token);
}
catch (TaskCanceledException)

2
Content.Client/GameObjects/EntitySystems/IconSmoothSystem.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Client.GameObjects.EntitySystems
/// <inheritdoc />
public override void Initialize()
{
SubscribeEvent<IconSmoothDirtyEvent>(HandleDirtyEvent);
SubscribeLocalEvent<IconSmoothDirtyEvent>(HandleDirtyEvent);
IoCManager.InjectDependencies(this);
}

2
Content.Client/GameObjects/EntitySystems/MeleeWeaponSystem.cs
View File

@@ -23,7 +23,7 @@ namespace Content.Client.GameObjects.EntitySystems
public override void Initialize()
{
SubscribeEvent<PlayMeleeWeaponAnimationMessage>(PlayWeaponArc);
SubscribeNetworkEvent<PlayMeleeWeaponAnimationMessage>(PlayWeaponArc);
EntityQuery = new TypeEntityQuery(typeof(MeleeWeaponArcAnimationComponent));
}

2
Content.Client/GameObjects/EntitySystems/SubFloorHideSystem.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Client.GameObjects.EntitySystems
_mapManager.GridChanged += MapManagerOnGridChanged;
_mapManager.TileChanged += MapManagerOnTileChanged;
SubscribeEvent<SubFloorHideDirtyEvent>(HandleDirtyEvent);
SubscribeLocalEvent<SubFloorHideDirtyEvent>(HandleDirtyEvent);
}
private void HandleDirtyEvent(SubFloorHideDirtyEvent ev)

2
Content.Client/GameObjects/EntitySystems/VerbSystem.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
base.Initialize();
SubscribeEvent<VerbSystemMessages.VerbsResponseMessage>(FillEntityPopup);
SubscribeNetworkEvent<VerbSystemMessages.VerbsResponseMessage>(FillEntityPopup);
IoCManager.InjectDependencies(this);

2
Content.Client/GameObjects/EntitySystems/WindowSystem.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Client.GameObjects.EntitySystems
{
base.Initialize();
SubscribeEvent<WindowSmoothDirtyEvent>(HandleDirtyEvent);
SubscribeLocalEvent<WindowSmoothDirtyEvent>(HandleDirtyEvent);
}
private void HandleDirtyEvent(WindowSmoothDirtyEvent ev)