tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EventBus Refactor (#490)

Browse Source 
* API changes for the new EventBus.

* Update Engine Module.
This commit is contained in:
Acruid
2019-12-08 19:52:29 -08:00
committed by GitHub
parent 7f188b0f44
commit 9c9984a40a
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Content.Client/GameObjects/Components/IconSmoothing/IconSmoothComponent.cs
View File

@@ -81,7 +81,7 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
base.Startup(); base.Startup();
SnapGrid.OnPositionChanged += SnapGridOnPositionChanged; SnapGrid.OnPositionChanged += SnapGridOnPositionChanged;
Owner.EntityManager.RaiseEvent(Owner, new IconSmoothDirtyEvent(null, SnapGrid.Offset, Mode)); Owner.EntityManager.EventBus.RaiseEvent(Owner, new IconSmoothDirtyEvent(null, SnapGrid.Offset, Mode));
if (Mode == IconSmoothingMode.Corners) if (Mode == IconSmoothingMode.Corners)
{ {
var state0 = $"{StateBase}0"; var state0 = $"{StateBase}0";
@@ -203,12 +203,12 @@ namespace Content.Client.GameObjects.Components.IconSmoothing
base.Shutdown(); base.Shutdown();
SnapGrid.OnPositionChanged -= SnapGridOnPositionChanged; SnapGrid.OnPositionChanged -= SnapGridOnPositionChanged;
Owner.EntityManager.RaiseEvent(Owner, new IconSmoothDirtyEvent(_lastPosition, SnapGrid.Offset, Mode)); Owner.EntityManager.EventBus.RaiseEvent(Owner, new IconSmoothDirtyEvent(_lastPosition, SnapGrid.Offset, Mode));
} }
private void SnapGridOnPositionChanged() private void SnapGridOnPositionChanged()
{ {
Owner.EntityManager.RaiseEvent(Owner, new IconSmoothDirtyEvent(_lastPosition, SnapGrid.Offset, Mode)); Owner.EntityManager.EventBus.RaiseEvent(Owner, new IconSmoothDirtyEvent(_lastPosition, SnapGrid.Offset, Mode));
_lastPosition = (Owner.Transform.GridID, SnapGrid.Position); _lastPosition = (Owner.Transform.GridID, SnapGrid.Position);
} }

6
Content.Client/GameObjects/Components/SubFloorHideComponent.cs
View File

@@ -32,7 +32,7 @@ namespace Content.Client.GameObjects.Components
base.Startup(); base.Startup();
_snapGridComponent.OnPositionChanged += SnapGridOnPositionChanged; _snapGridComponent.OnPositionChanged += SnapGridOnPositionChanged;
Owner.EntityManager.RaiseEvent(Owner, new SubFloorHideDirtyEvent()); Owner.EntityManager.EventBus.RaiseEvent(Owner, new SubFloorHideDirtyEvent());
} }
/// <inheritdoc /> /// <inheritdoc />
@@ -41,12 +41,12 @@ namespace Content.Client.GameObjects.Components
base.Shutdown(); base.Shutdown();
_snapGridComponent.OnPositionChanged -= SnapGridOnPositionChanged; _snapGridComponent.OnPositionChanged -= SnapGridOnPositionChanged;
Owner.EntityManager.RaiseEvent(Owner, new SubFloorHideDirtyEvent()); Owner.EntityManager.EventBus.RaiseEvent(Owner, new SubFloorHideDirtyEvent());
} }
private void SnapGridOnPositionChanged() private void SnapGridOnPositionChanged()
{ {
Owner.EntityManager.RaiseEvent(Owner, new SubFloorHideDirtyEvent()); Owner.EntityManager.EventBus.RaiseEvent(Owner, new SubFloorHideDirtyEvent());
} }
} }

4
Content.Client/GameObjects/Components/WindowComponent.cs
View File

@@ -31,7 +31,7 @@ namespace Content.Client.GameObjects.Components
base.Startup(); base.Startup();
_snapGrid.OnPositionChanged += SnapGridOnPositionChanged; _snapGrid.OnPositionChanged += SnapGridOnPositionChanged;
Owner.EntityManager.RaiseEvent(Owner, new WindowSmoothDirtyEvent()); Owner.EntityManager.EventBus.RaiseEvent(Owner, new WindowSmoothDirtyEvent());
var state0 = $"{_stateBase}0"; var state0 = $"{_stateBase}0";
_sprite.LayerMapSet(CornerLayers.SE, _sprite.AddLayerState(state0)); _sprite.LayerMapSet(CornerLayers.SE, _sprite.AddLayerState(state0));
@@ -54,7 +54,7 @@ namespace Content.Client.GameObjects.Components
private void SnapGridOnPositionChanged() private void SnapGridOnPositionChanged()
{ {
Owner.EntityManager.RaiseEvent(Owner, new WindowSmoothDirtyEvent()); Owner.EntityManager.EventBus.RaiseEvent(Owner, new WindowSmoothDirtyEvent());
} }
public void UpdateSprite() public void UpdateSprite()

6
Content.Server/GameTicking/GameRules/RuleDeathMatch.cs
View File

@@ -1,4 +1,4 @@
using System; using System;
using System.Threading; using System.Threading;
using Content.Server.GameObjects; using Content.Server.GameObjects;
using Content.Server.Interfaces.Chat; using Content.Server.Interfaces.Chat;
@@ -34,7 +34,7 @@ namespace Content.Server.GameTicking.GameRules
{ {
_chatManager.DispatchServerAnnouncement("The game is now a death match. Kill everybody else to win!"); _chatManager.DispatchServerAnnouncement("The game is now a death match. Kill everybody else to win!");
_entityManager.SubscribeEvent<MobDamageStateChangedMessage>(_onMobDamageStateChanged, this); _entityManager.EventBus.SubscribeEvent<MobDamageStateChangedMessage>(_onMobDamageStateChanged, this);
_playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged; _playerManager.PlayerStatusChanged += PlayerManagerOnPlayerStatusChanged;
} }
@@ -42,7 +42,7 @@ namespace Content.Server.GameTicking.GameRules
{ {
base.Removed(); base.Removed();
_entityManager.UnsubscribeEvent<MobDamageStateChangedMessage>(this); _entityManager.EventBus.UnsubscribeEvent<MobDamageStateChangedMessage>(this);
_playerManager.PlayerStatusChanged -= PlayerManagerOnPlayerStatusChanged; _playerManager.PlayerStatusChanged -= PlayerManagerOnPlayerStatusChanged;
} }

2
RobustToolbox

Submodule RobustToolbox updated: 31fb926127...ea8e5e9fe7