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/Body/BodyScannerComponent.cs
View File

@@ -18,12 +18,12 @@ namespace Content.Server.GameObjects.Components.Body
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
var session = actor.playerSession;
var session = actor.PlayerSession;
if (session.AttachedEntity == null)
{

10
Content.Server/GameObjects/Components/Body/MechanismComponent.cs
View File

@@ -79,10 +79,10 @@ namespace Content.Server.GameObjects.Components.Body
}
if (OptionsCache.Count > 0 &&
eventArgs.User.TryGetComponent(out IActorComponent? actor))
eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
OpenSurgeryUI(actor.playerSession);
UpdateSurgeryUIBodyPartRequest(actor.playerSession, toSend);
OpenSurgeryUI(actor.PlayerSession);
UpdateSurgeryUIBodyPartRequest(actor.PlayerSession, toSend);
PerformerCache = eventArgs.User;
BodyCache = body;
}
@@ -99,12 +99,12 @@ namespace Content.Server.GameObjects.Components.Body
private void HandleReceiveBodyPart(int key)
{
if (PerformerCache == null ||
!PerformerCache.TryGetComponent(out IActorComponent? actor))
!PerformerCache.TryGetComponent(out ActorComponent? actor))
{
return;
}
CloseSurgeryUI(actor.playerSession);
CloseSurgeryUI(actor.PlayerSession);
if (BodyCache == null)
{

12
Content.Server/GameObjects/Components/Body/Part/BodyPartComponent.cs
View File

@@ -144,8 +144,8 @@ namespace Content.Server.GameObjects.Components.Body.Part
if (_optionsCache.Count > 0)
{
OpenSurgeryUI(eventArgs.User.GetComponent<BasicActorComponent>().playerSession);
BodyPartSlotRequest(eventArgs.User.GetComponent<BasicActorComponent>().playerSession,
OpenSurgeryUI(eventArgs.User.GetComponent<ActorComponent>().PlayerSession);
BodyPartSlotRequest(eventArgs.User.GetComponent<ActorComponent>().PlayerSession,
toSend);
_surgeonCache = eventArgs.User;
_owningBodyCache = body;
@@ -164,12 +164,12 @@ namespace Content.Server.GameObjects.Components.Body.Part
private void ReceiveBodyPartSlot(int key)
{
if (_surgeonCache == null ||
!_surgeonCache.TryGetComponent(out IActorComponent? actor))
!_surgeonCache.TryGetComponent(out ActorComponent? actor))
{
return;
}
CloseSurgeryUI(actor.playerSession);
CloseSurgeryUI(actor.PlayerSession);
if (_owningBodyCache == null)
{
@@ -233,14 +233,14 @@ namespace Content.Server.GameObjects.Components.Body.Part
return;
}
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "attachbodypart"))
if (!groupController.CanCommand(actor.PlayerSession, "attachbodypart"))
{
return;
}

18
Content.Server/GameObjects/Components/Body/Surgery/SurgeryToolComponent.cs
View File

@@ -56,7 +56,7 @@ namespace Content.Server.GameObjects.Components.Body.Surgery
return false;
}
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return false;
}
@@ -81,8 +81,8 @@ namespace Content.Server.GameObjects.Components.Body.Surgery
if (_optionsCache.Count > 0)
{
OpenSurgeryUI(actor.playerSession);
UpdateSurgeryUIBodyPartRequest(actor.playerSession, toSend);
OpenSurgeryUI(actor.PlayerSession);
UpdateSurgeryUIBodyPartRequest(actor.PlayerSession, toSend);
PerformerCache = eventArgs.User; // Also, cache the data.
BodyCache = body;
}
@@ -131,8 +131,8 @@ namespace Content.Server.GameObjects.Components.Body.Surgery
if (_optionsCache.Count > 0 && PerformerCache != null)
{
OpenSurgeryUI(PerformerCache.GetComponent<BasicActorComponent>().playerSession);
UpdateSurgeryUIMechanismRequest(PerformerCache.GetComponent<BasicActorComponent>().playerSession,
OpenSurgeryUI(PerformerCache.GetComponent<ActorComponent>().PlayerSession);
UpdateSurgeryUIMechanismRequest(PerformerCache.GetComponent<ActorComponent>().PlayerSession,
toSend);
_callbackCache = callback;
}
@@ -214,12 +214,12 @@ namespace Content.Server.GameObjects.Components.Body.Surgery
private void HandleReceiveBodyPart(int key)
{
if (PerformerCache == null ||
!PerformerCache.TryGetComponent(out IActorComponent? actor))
!PerformerCache.TryGetComponent(out ActorComponent? actor))
{
return;
}
CloseSurgeryUI(actor.playerSession);
CloseSurgeryUI(actor.PlayerSession);
// TODO: sanity checks to see whether user is in range, user is still able-bodied, target is still the same, etc etc
if (!_optionsCache.TryGetValue(key, out var targetObject) ||
BodyCache == null)
@@ -248,13 +248,13 @@ namespace Content.Server.GameObjects.Components.Body.Surgery
!_optionsCache.TryGetValue(key, out var targetObject) ||
targetObject is not MechanismComponent target ||
PerformerCache == null ||
!PerformerCache.TryGetComponent(out IActorComponent? actor))
!PerformerCache.TryGetComponent(out ActorComponent? actor))
{
NotUsefulAnymorePopup();
return;
}
CloseSurgeryUI(actor.playerSession);
CloseSurgeryUI(actor.PlayerSession);
_callbackCache?.Invoke(target, BodyCache, this, PerformerCache);
}