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

Map & Grid Entities (#493)

Browse Source 
* Client & Server load with new scene hierarchy.

* Engine Update.
This commit is contained in:
Acruid
2019-12-22 04:23:38 -08:00
committed by Pieter-Jan Briers
parent c2c512a7e3
commit ece6e0a833
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,6 +40,9 @@ namespace Content.Client.GameObjects.Components
{ {
base.Shutdown(); base.Shutdown();
if(Owner.Transform.Running == false)
return;
_snapGridComponent.OnPositionChanged -= SnapGridOnPositionChanged; _snapGridComponent.OnPositionChanged -= SnapGridOnPositionChanged;
Owner.EntityManager.EventBus.RaiseEvent(Owner, new SubFloorHideDirtyEvent()); Owner.EntityManager.EventBus.RaiseEvent(Owner, new SubFloorHideDirtyEvent());
} }

4
Content.Server/GameObjects/Components/Power/PowerNodeComponent.cs
View File

@@ -37,9 +37,9 @@ namespace Content.Server.GameObjects.Components.Power
/// </summary> /// </summary>
public event EventHandler<PowernetEventArgs> OnPowernetRegenerate; public event EventHandler<PowernetEventArgs> OnPowernetRegenerate;
public override void Initialize() protected override void Startup()
{ {
base.Initialize(); base.Startup();
TryCreatePowernetConnection(); TryCreatePowernetConnection();
} }

4
Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
View File

@@ -27,9 +27,9 @@ namespace Content.Server.GameObjects.Components.Power
[ViewVariables] [ViewVariables]
public bool Regenerating { get; set; } = false; public bool Regenerating { get; set; } = false;
public override void Initialize() protected override void Startup()
{ {
base.Initialize(); base.Startup();
if (Parent == null) if (Parent == null)
{ {

2
RobustToolbox

Submodule RobustToolbox updated: df34ce025a...f5c0dba194