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

8
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

7
Content.Server/Roles/RoleAddedEvent.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Content.Server.Roles
{
public sealed class RoleAddedEvent : RoleEvent
{
public RoleAddedEvent(Role role) : base(role) { }
}
}

7
Content.Server/Roles/RoleAddedMessage.cs
View File

@@ -1,7 +0,0 @@
namespace Content.Server.Roles
{
public class RoleAddedMessage : RoleMessage
{
public RoleAddedMessage(Role role) : base(role) { }
}
}

4
Content.Server/Roles/RoleMessage.cs → Content.Server/Roles/RoleEvent.cs
View File

@@ -2,11 +2,11 @@
namespace Content.Server.Roles
{
public class RoleMessage : ComponentMessage
public class RoleEvent : EntityEventArgs
{
public readonly Role Role;
public RoleMessage(Role role)
public RoleEvent(Role role)
{
Role = role;
}

7
Content.Server/Roles/RoleRemovedEvent.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Content.Server.Roles
{
public sealed class RoleRemovedEvent : RoleEvent
{
public RoleRemovedEvent(Role role) : base(role) { }
}
}

7
Content.Server/Roles/RoleRemovedMessage.cs
View File

@@ -1,7 +0,0 @@
namespace Content.Server.Roles
{
public class RoleRemovedMessage : RoleMessage
{
public RoleRemovedMessage(Role role) : base(role) { }
}
}

24
Content.Server/Suspicion/EntitySystems/SuspicionRoleSystem.cs
View File

@@ -1,4 +1,6 @@
using System.Collections.Generic;
using Content.Server.Roles;
using Content.Server.Suspicion.Roles;
using Content.Shared.GameTicking;
using JetBrains.Annotations;
using Robust.Server.GameObjects;
@@ -20,20 +22,34 @@ namespace Content.Server.Suspicion.EntitySystems
base.Initialize();
SubscribeLocalEvent<RoundRestartCleanupEvent>(Reset);
SubscribeLocalEvent<SuspicionRoleComponent, PlayerAttachedEvent>((HandlePlayerAttached));
SubscribeLocalEvent<SuspicionRoleComponent, PlayerDetachedEvent>((HandlePlayerDetached));
SubscribeLocalEvent<SuspicionRoleComponent, PlayerAttachedEvent>(OnPlayerAttached);
SubscribeLocalEvent<SuspicionRoleComponent, PlayerDetachedEvent>(OnPlayerDetached);
SubscribeLocalEvent<SuspicionRoleComponent, RoleAddedEvent>(OnRoleAdded);
SubscribeLocalEvent<SuspicionRoleComponent, RoleRemovedEvent>(OnRoleRemoved);
}
private void HandlePlayerDetached(EntityUid uid, SuspicionRoleComponent component, PlayerDetachedEvent args)
private void OnPlayerDetached(EntityUid uid, SuspicionRoleComponent component, PlayerDetachedEvent args)
{
component.SyncRoles();
}
private void HandlePlayerAttached(EntityUid uid, SuspicionRoleComponent component, PlayerAttachedEvent args)
private void OnPlayerAttached(EntityUid uid, SuspicionRoleComponent component, PlayerAttachedEvent args)
{
component.SyncRoles();
}
private void OnRoleAdded(EntityUid uid, SuspicionRoleComponent component, RoleAddedEvent args)
{
if (args.Role is not SuspicionRole role) return;
component.Role = role;
}
private void OnRoleRemoved(EntityUid uid, SuspicionRoleComponent component, RoleRemovedEvent args)
{
if (args.Role is not SuspicionRole) return;
component.Role = null;
}
#endregion
public void AddTraitor(SuspicionRoleComponent role)

15
Content.Server/Suspicion/SuspicionRoleComponent.cs
View File

@@ -162,20 +162,5 @@ namespace Content.Server.Suspicion
return new SuspicionRoleComponentState(Role?.Name, Role?.Antagonist, allies.ToArray());
}
public override void HandleMessage(ComponentMessage message, IComponent? component)
{
base.HandleMessage(message, component);
switch (message)
{
case RoleAddedMessage {Role: SuspicionRole role}:
Role = role;
break;
case RoleRemovedMessage {Role: SuspicionRole}:
Role = null;
break;
}
}
}
}