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

Use ActorComponent instead of IActorComponent or BasicActorComponent. (#3966)

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-05-12 13:42:18 +02:00
committed by GitHub
parent 3319dc0599
commit 462cddf860
65 changed files with 220 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Content.Server/GameObjects/Components/Chemistry/ChemMasterComponent.cs
View File

@@ -348,7 +348,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
/// <param name="args">Data relevant to the event such as the actor which triggered it.</param>
void IActivate.Activate(ActivateEventArgs args)
{
if (!args.User.TryGetComponent(out IActorComponent? actor))
if (!args.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -362,7 +362,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
var activeHandEntity = hands.GetActiveHand?.Owner;
if (activeHandEntity == null)
{
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
}

4
Content.Server/GameObjects/Components/Chemistry/ReagentDispenserComponent.cs
View File

@@ -288,7 +288,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
/// <param name="args">Data relevant to the event such as the actor which triggered it.</param>
void IActivate.Activate(ActivateEventArgs args)
{
if (!args.User.TryGetComponent(out IActorComponent? actor))
if (!args.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -302,7 +302,7 @@ namespace Content.Server.GameObjects.Components.Chemistry
var activeHandEntity = hands.GetActiveHand?.Owner;
if (activeHandEntity == null)
{
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
}

10
Content.Server/GameObjects/Components/Chemistry/SolutionTransferVerbs.cs
View File

@@ -176,9 +176,9 @@ namespace Content.Server.GameObjects.Components.Chemistry
var adminManager = IoCManager.Resolve<IAdminManager>();
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (adminManager.HasAdminFlag(player.playerSession, ReqFlags))
if (adminManager.HasAdminFlag(player.PlayerSession, ReqFlags))
{
data.Visibility = VerbVisibility.Visible;
}
@@ -188,10 +188,10 @@ namespace Content.Server.GameObjects.Components.Chemistry
public override void Activate(IEntity user, IEntity target)
{
var groupController = IoCManager.Resolve<IAdminManager>();
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (groupController.HasAdminFlag(player.playerSession, ReqFlags))
OpenAddReagentMenu(player.playerSession, target);
if (groupController.HasAdminFlag(player.PlayerSession, ReqFlags))
OpenAddReagentMenu(player.PlayerSession, target);
}
}