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

Inline EntityManager

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 11:11:52 +01:00
parent bd18574412
commit 5e177ae734
108 changed files with 250 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Content.Server/Mind/Components/MindComponent.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Server.Mind.Components
public void InternalEjectMind()
{
if (!Deleted)
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new MindRemovedMessage());
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(Owner.Uid, new MindRemovedMessage());
Mind = null;
}
@@ -71,7 +71,7 @@ namespace Content.Server.Mind.Components
public void InternalAssignMind(Mind value)
{
Mind = value;
Owner.EntityManager.EventBus.RaiseLocalEvent(Owner.Uid, new MindAddedMessage());
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(Owner.Uid, new MindAddedMessage());
}
protected override void Shutdown()
@@ -103,13 +103,13 @@ namespace Content.Server.Mind.Components
// Async this so that we don't throw if the grid we're on is being deleted.
var mapMan = IoCManager.Resolve<IMapManager>();
var gridId = spawnPosition.GetGridId(Owner.EntityManager);
var gridId = spawnPosition.GetGridId(IoCManager.Resolve<IEntityManager>());
if (gridId == GridId.Invalid || !mapMan.GridExists(gridId))
{
spawnPosition = EntitySystem.Get<GameTicker>().GetObserverSpawnPoint();
}
var ghost = Owner.EntityManager.SpawnEntity("MobObserver", spawnPosition);
var ghost = IoCManager.Resolve<IEntityManager>().SpawnEntity("MobObserver", spawnPosition);
var ghostComponent = ghost.GetComponent<GhostComponent>();
EntitySystem.Get<SharedGhostSystem>().SetCanReturnToBody(ghostComponent, false);

8
Content.Server/Mind/Mind.cs
View File

@@ -184,7 +184,8 @@ namespace Content.Server.Mind
role.Greet();
var message = new RoleAddedEvent(role);
OwnedEntity?.EntityManager.EventBus.RaiseLocalEvent(OwnedEntity.Uid, message);
IEntity? tempQualifier = OwnedEntity;
(tempQualifier != null ? IoCManager.Resolve<IEntityManager>() : null).EventBus.RaiseLocalEvent(OwnedEntity.Uid, message);
return role;
}
@@ -206,7 +207,8 @@ namespace Content.Server.Mind
_roles.Remove(role);
var message = new RoleRemovedEvent(role);
OwnedEntity?.EntityManager.EventBus.RaiseLocalEvent(OwnedEntity.Uid, message);
IEntity? tempQualifier = OwnedEntity;
(tempQualifier != null ? IoCManager.Resolve<IEntityManager>() : null).EventBus.RaiseLocalEvent(OwnedEntity.Uid, message);
}
public bool HasRole<T>() where T : Role
@@ -380,7 +382,7 @@ namespace Content.Server.Mind
oldVisitingEnt.RemoveComponent<VisitingMindComponent>();
}
oldVisitingEnt.EntityManager.EventBus.RaiseLocalEvent(oldVisitingEnt.Uid, new MindUnvisitedMessage());
IoCManager.Resolve<IEntityManager>().EventBus.RaiseLocalEvent(oldVisitingEnt.Uid, new MindUnvisitedMessage());
}
public bool TryGetSession([NotNullWhen(true)] out IPlayerSession? session)