Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 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

12
Content.Server/GameObjects/Components/Atmos/GasAnalyzerComponent.cs
View File

@@ -257,9 +257,9 @@ namespace Content.Server.GameObjects.Components.Atmos
return true;
}
if (eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
OpenInterface(actor.playerSession, eventArgs.ClickLocation);
OpenInterface(actor.PlayerSession, eventArgs.ClickLocation);
}
return true;
@@ -269,17 +269,17 @@ namespace Content.Server.GameObjects.Components.Atmos
void IDropped.Dropped(DroppedEventArgs eventArgs)
{
if (eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
CloseInterface(actor.playerSession);
CloseInterface(actor.PlayerSession);
}
}
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
ToggleInterface(actor.playerSession);
ToggleInterface(actor.PlayerSession);
return true;
}
return false;

4
Content.Server/GameObjects/Components/Atmos/GasCanisterComponent.cs
View File

@@ -156,10 +156,10 @@ namespace Content.Server.GameObjects.Components.Atmos
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
return;
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
private void OnUiReceiveMessage(ServerBoundUserInterfaceMessage obj)

14
Content.Server/GameObjects/Components/Atmos/GasTankComponent.cs
View File

@@ -159,15 +159,15 @@ namespace Content.Server.GameObjects.Components.Atmos
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor)) return false;
OpenInterface(actor.playerSession);
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor)) return false;
OpenInterface(actor.PlayerSession);
return true;
}
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor)) return;
OpenInterface(actor.playerSession);
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor)) return;
OpenInterface(actor.PlayerSession);
}
public void ConnectToInternals()
@@ -330,7 +330,7 @@ namespace Content.Server.GameObjects.Components.Atmos
protected override void GetData(IEntity user, GasTankComponent component, VerbData data)
{
data.Visibility = VerbVisibility.Invisible;
if (!user.HasComponent<IActorComponent>())
if (!user.HasComponent<ActorComponent>())
{
return;
}
@@ -341,12 +341,12 @@ namespace Content.Server.GameObjects.Components.Atmos
protected override void Activate(IEntity user, GasTankComponent component)
{
if (!user.TryGetComponent<IActorComponent>(out var actor))
if (!user.TryGetComponent<ActorComponent>(out var actor))
{
return;
}
component.OpenInterface(actor.playerSession);
component.OpenInterface(actor.PlayerSession);
}
}
}