space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix EntityManager.InitializeEntity being static for no reason at all.

Browse Source 
- Also fixes `EntityInitialized` not being invoked on many cases. (On the client, on entities created by `ClientGameStateManager`, for example...)
This commit is contained in:
Vera Aguilera Puerto
2021-10-05 10:59:15 +02:00
parent 082fac52cd
commit a986292aa2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Client/GameObjects/ClientEntityManager.cs
View File

@@ -40,7 +40,7 @@ namespace Robust.Client.GameObjects
void IClientEntityManagerInternal.InitializeEntity(IEntity entity)
{
EntityManager.InitializeEntity((Entity)entity);
base.InitializeEntity((Entity)entity);
}
void IClientEntityManagerInternal.StartEntity(IEntity entity)

4
Robust.Shared/GameObjects/EntityManager.cs
View File

@@ -405,7 +405,6 @@ namespace Robust.Shared.GameObjects
try
{
InitializeEntity(entity);
EntityInitialized?.Invoke(this, entity.Uid);
StartEntity(entity);
}
catch (Exception e)
@@ -415,9 +414,10 @@ namespace Robust.Shared.GameObjects
}
}
private protected static void InitializeEntity(Entity entity)
protected void InitializeEntity(Entity entity)
{
entity.InitializeComponents();
EntityInitialized?.Invoke(this, entity.Uid);
}
protected void StartEntity(Entity entity)