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

Convert sus events to eventbus (#5044)

Browse Source
This commit is contained in:
metalgearsloth
2021-10-27 19:53:10 +11:00
committed by GitHub
parent 3b508b041b
commit a12eb29464
8 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,8 +166,8 @@ namespace Content.Server.Mind
_roles.Add(role);
role.Greet();
var message = new RoleAddedMessage(role);
OwnedEntity?.SendMessage(OwnedComponent, message);
var message = new RoleAddedEvent(role);
OwnedEntity?.EntityManager.EventBus.RaiseLocalEvent(OwnedEntity.Uid, message);
return role;
}
@@ -188,8 +188,8 @@ namespace Content.Server.Mind
_roles.Remove(role);
var message = new RoleRemovedMessage(role);
OwnedEntity?.SendMessage(OwnedComponent, message);
var message = new RoleRemovedEvent(role);
OwnedEntity?.EntityManager.EventBus.RaiseLocalEvent(OwnedEntity.Uid, message);
}
public bool HasRole<T>() where T : Role
@@ -278,7 +278,7 @@ namespace Content.Server.Mind
if (IsVisitingEntity
&& (ghostCheckOverride // to force mind transfer, for example from ControlMobVerb
|| !VisitingEntity!.TryGetComponent(out GhostComponent? ghostComponent) // visiting entity is not a Ghost
|| !ghostComponent.CanReturnToBody)) // it is a ghost, but cannot return to body anyway, so it's okay
|| !ghostComponent.CanReturnToBody)) // it is a ghost, but cannot return to body anyway, so it's okay
{
VisitingEntity = null;
}