tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests 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/Actions/DisarmAction.cs
View File

@@ -40,10 +40,10 @@ namespace Content.Server.Actions
if (disarmedActs.Length == 0)
{
if (args.Performer.TryGetComponent(out IActorComponent? actor))
if (args.Performer.TryGetComponent(out ActorComponent? actor))
{
// Fall back to a normal interaction with the entity
var player = actor.playerSession;
var player = actor.PlayerSession;
var coordinates = args.Target.Transform.Coordinates;
var target = args.Target.Uid;
EntitySystem.Get<InteractionSystem>().HandleClientUseItemInHand(player, coordinates, target);

4
Content.Server/Administration/Commands/SetOutfitCommand.cs
View File

@@ -86,9 +86,9 @@ namespace Content.Server.Administration.Commands
HumanoidCharacterProfile? profile = null;
// Check if we are setting the outfit of a player to respect the preferences
if (target.TryGetComponent<IActorComponent>(out var actorComponent))
if (target.TryGetComponent<ActorComponent>(out var actorComponent))
{
var userId = actorComponent.playerSession.UserId;
var userId = actorComponent.PlayerSession.UserId;
var preferencesManager = IoCManager.Resolve<IServerPreferencesManager>();
var prefs = preferencesManager.GetPreferences(userId);
profile = prefs.SelectedCharacter as HumanoidCharacterProfile;

8
Content.Server/Chat/ChatManager.cs
View File

@@ -126,12 +126,12 @@ namespace Content.Server.Chat
}
// Check if message exceeds the character limit if the sender is a player
if (source.TryGetComponent(out IActorComponent? actor) &&
if (source.TryGetComponent(out ActorComponent? actor) &&
message.Length > MaxMessageLength)
{
var feedback = Loc.GetString(MaxLengthExceededMessage, MaxMessageLength);
DispatchServerMessage(actor.playerSession, feedback);
DispatchServerMessage(actor.PlayerSession, feedback);
return;
}
@@ -199,7 +199,7 @@ namespace Content.Server.Chat
}
// Check if entity is a player
if (!source.TryGetComponent(out IActorComponent? actor))
if (!source.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -207,7 +207,7 @@ namespace Content.Server.Chat
// Check if message exceeds the character limit
if (action.Length > MaxMessageLength)
{
DispatchServerMessage(actor.playerSession, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
DispatchServerMessage(actor.PlayerSession, Loc.GetString(MaxLengthExceededMessage, MaxMessageLength));
return;
}

4
Content.Server/GameObjects/Components/Access/IdCardConsoleComponent.cs
View File

@@ -214,12 +214,12 @@ namespace Content.Server.GameObjects.Components.Access
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);
}
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)

8
Content.Server/GameObjects/Components/Arcade/BlockGameArcadeComponent.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Server.GameObjects.Components.Arcade
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if(!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if(!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -58,10 +58,10 @@ namespace Content.Server.GameObjects.Components.Arcade
{
return;
}
if(!ActionBlockerSystem.CanInteract(actor.playerSession.AttachedEntity)) return;
if(!ActionBlockerSystem.CanInteract(actor.PlayerSession.AttachedEntity)) return;
UserInterface?.Toggle(actor.playerSession);
RegisterPlayerSession(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
RegisterPlayerSession(actor.PlayerSession);
}
private void RegisterPlayerSession(IPlayerSession session)

8
Content.Server/GameObjects/Components/Arcade/SpaceVillainArcadeComponent.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Server.GameObjects.Components.Arcade
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if(!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if(!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -67,16 +67,16 @@ namespace Content.Server.GameObjects.Components.Arcade
{
return;
}
if(!ActionBlockerSystem.CanInteract(actor.playerSession.AttachedEntity)) return;
if(!ActionBlockerSystem.CanInteract(actor.PlayerSession.AttachedEntity)) return;
_game ??= new SpaceVillainGame(this);
if (_wiresComponent?.IsPanelOpen == true)
{
_wiresComponent.OpenInterface(actor.playerSession);
_wiresComponent.OpenInterface(actor.PlayerSession);
} else
{
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
}
}

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);
}
}
}

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);
}

4
Content.Server/GameObjects/Components/Cargo/CargoConsoleComponent.cs
View File

@@ -191,14 +191,14 @@ namespace Content.Server.GameObjects.Components.Cargo
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
if (!Powered)
return;
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
private void UpdateUIState()

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);
}
}

4
Content.Server/GameObjects/Components/Command/CommunicationsConsoleComponent.cs
View File

@@ -128,7 +128,7 @@ namespace Content.Server.GameObjects.Components.Command
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
return;
/*
if (!Powered)
@@ -136,7 +136,7 @@ namespace Content.Server.GameObjects.Components.Command
return;
}
*/
OpenUserInterface(actor.playerSession);
OpenUserInterface(actor.PlayerSession);
}
}
}

10
Content.Server/GameObjects/Components/ConfigurationComponent.cs
View File

@@ -78,7 +78,7 @@ namespace Content.Server.GameObjects.Components
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)
{
if (UserInterface == null || !eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (UserInterface == null || !eventArgs.User.TryGetComponent(out ActorComponent? actor))
return false;
if (!eventArgs.Using.TryGetComponent<ToolComponent>(out var tool))
@@ -117,11 +117,11 @@ namespace Content.Server.GameObjects.Components
UserInterface?.SetState(new ConfigurationBoundUserInterfaceState(_config));
}
private void OpenUserInterface(IActorComponent actor)
private void OpenUserInterface(ActorComponent actor)
{
UpdateUserInterface();
UserInterface?.Open(actor.playerSession);
UserInterface?.SendMessage(new ValidationUpdateMessage(_validation.ToString()), actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
UserInterface?.SendMessage(new ValidationUpdateMessage(_validation.ToString()), actor.PlayerSession);
}
private static void FillConfiguration<T>(List<string> list, Dictionary<string, T> configuration, T value){
@@ -150,7 +150,7 @@ namespace Content.Server.GameObjects.Components
protected override void Activate(IEntity user, ConfigurationComponent component)
{
if (user.TryGetComponent(out IActorComponent? actor))
if (user.TryGetComponent(out ActorComponent? actor))
{
component.OpenUserInterface(actor);
}

10
Content.Server/GameObjects/Components/CrayonComponent.cs
View File

@@ -95,10 +95,10 @@ namespace Content.Server.GameObjects.Components
// Opens the selection window
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
UserInterface?.Toggle(actor.playerSession);
if (UserInterface?.SessionHasOpen(actor.playerSession) == true)
UserInterface?.Toggle(actor.PlayerSession);
if (UserInterface?.SessionHasOpen(actor.PlayerSession) == true)
{
// Tell the user interface the selected stuff
UserInterface.SetState(
@@ -146,8 +146,8 @@ namespace Content.Server.GameObjects.Components
void IDropped.Dropped(DroppedEventArgs eventArgs)
{
if (eventArgs.User.TryGetComponent(out IActorComponent? actor))
UserInterface?.Close(actor.playerSession);
if (eventArgs.User.TryGetComponent(out ActorComponent? actor))
UserInterface?.Close(actor.PlayerSession);
}
}
}

12
Content.Server/GameObjects/Components/Disposal/DisposalMailingUnitComponent.cs
View File

@@ -186,9 +186,9 @@ namespace Content.Server.GameObjects.Components.Disposal
{
TryQueueEngage();
if (entity.TryGetComponent(out IActorComponent? actor))
if (entity.TryGetComponent(out ActorComponent? actor))
{
UserInterface?.Close(actor.playerSession);
UserInterface?.Close(actor.PlayerSession);
}
UpdateVisualState();
@@ -688,7 +688,7 @@ namespace Content.Server.GameObjects.Components.Disposal
return false;
}
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return false;
}
@@ -699,7 +699,7 @@ namespace Content.Server.GameObjects.Components.Disposal
{
UpdateTargetList();
UpdateInterface();
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
return true;
}
@@ -708,14 +708,14 @@ namespace Content.Server.GameObjects.Components.Disposal
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
if (IsValidInteraction(eventArgs))
{
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
return;

8
Content.Server/GameObjects/Components/Disposal/DisposalRouterComponent.cs
View File

@@ -156,7 +156,7 @@ namespace Content.Server.GameObjects.Components.Disposal
/// <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;
}
@@ -180,10 +180,10 @@ namespace Content.Server.GameObjects.Components.Disposal
base.OnRemove();
}
private void OpenUserInterface(IActorComponent actor)
private void OpenUserInterface(ActorComponent actor)
{
UpdateUserInterface();
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
[Verb]
@@ -205,7 +205,7 @@ namespace Content.Server.GameObjects.Components.Disposal
protected override void Activate(IEntity user, DisposalRouterComponent component)
{
if (user.TryGetComponent(out IActorComponent? actor))
if (user.TryGetComponent(out ActorComponent? actor))
{
component.OpenUserInterface(actor);
}

10
Content.Server/GameObjects/Components/Disposal/DisposalTaggerComponent.cs
View File

@@ -122,7 +122,7 @@ namespace Content.Server.GameObjects.Components.Disposal
/// <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;
}
@@ -153,7 +153,7 @@ namespace Content.Server.GameObjects.Components.Disposal
{
var groupController = IoCManager.Resolve<IConGroupController>();
if (!user.TryGetComponent(out IActorComponent? actor) || !groupController.CanAdminMenu(actor.playerSession))
if (!user.TryGetComponent(out ActorComponent? actor) || !groupController.CanAdminMenu(actor.PlayerSession))
{
data.Visibility = VerbVisibility.Invisible;
return;
@@ -165,17 +165,17 @@ namespace Content.Server.GameObjects.Components.Disposal
protected override void Activate(IEntity user, DisposalTaggerComponent component)
{
if (user.TryGetComponent(out IActorComponent? actor))
if (user.TryGetComponent(out ActorComponent? actor))
{
component.OpenUserInterface(actor);
}
}
}
private void OpenUserInterface(IActorComponent actor)
private void OpenUserInterface(ActorComponent actor)
{
UpdateUserInterface();
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
}
}

8
Content.Server/GameObjects/Components/Disposal/DisposalTubeComponent.cs
View File

@@ -292,9 +292,9 @@ namespace Content.Server.GameObjects.Components.Disposal
var groupController = IoCManager.Resolve<IConGroupController>();
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (groupController.CanCommand(player.playerSession, "tubeconnections"))
if (groupController.CanCommand(player.PlayerSession, "tubeconnections"))
{
data.Visibility = VerbVisibility.Visible;
}
@@ -305,9 +305,9 @@ namespace Content.Server.GameObjects.Components.Disposal
{
var groupController = IoCManager.Resolve<IConGroupController>();
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (groupController.CanCommand(player.playerSession, "tubeconnections"))
if (groupController.CanCommand(player.PlayerSession, "tubeconnections"))
{
component.PopupDirections(user);
}

12
Content.Server/GameObjects/Components/Disposal/DisposalUnitComponent.cs
View File

@@ -166,9 +166,9 @@ namespace Content.Server.GameObjects.Components.Disposal
{
TryQueueEngage();
if (entity.TryGetComponent(out IActorComponent? actor))
if (entity.TryGetComponent(out ActorComponent? actor))
{
UserInterface?.Close(actor.playerSession);
UserInterface?.Close(actor.PlayerSession);
}
UpdateVisualState();
@@ -584,7 +584,7 @@ namespace Content.Server.GameObjects.Components.Disposal
bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return false;
}
@@ -592,7 +592,7 @@ namespace Content.Server.GameObjects.Components.Disposal
if (IsValidInteraction(eventArgs))
{
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
return true;
}
@@ -601,14 +601,14 @@ namespace Content.Server.GameObjects.Components.Disposal
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
if (IsValidInteraction(eventArgs))
{
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
return;

4
Content.Server/GameObjects/Components/Doors/AirlockComponent.cs
View File

@@ -156,9 +156,9 @@ namespace Content.Server.GameObjects.Components.Doors
bool IDoorCheck.BlockActivate(ActivateEventArgs eventArgs)
{
if (_wiresComponent != null && _wiresComponent.IsPanelOpen &&
eventArgs.User.TryGetComponent(out IActorComponent? actor))
eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
_wiresComponent.OpenInterface(actor.playerSession);
_wiresComponent.OpenInterface(actor.PlayerSession);
return true;
}
return false;

4
Content.Server/GameObjects/Components/GUI/InventoryComponent.cs
View File

@@ -705,8 +705,8 @@ namespace Content.Server.GameObjects.Components.GUI
private static bool CanCommand(IEntity user)
{
var groupController = IoCManager.Resolve<IConGroupController>();
return user.TryGetComponent<IActorComponent>(out var player) &&
groupController.CanCommand(player.playerSession, "setoutfit");
return user.TryGetComponent<ActorComponent>(out var player) &&
groupController.CanCommand(player.PlayerSession, "setoutfit");
}
}
}

8
Content.Server/GameObjects/Components/GUI/StrippableComponent.cs
View File

@@ -76,9 +76,9 @@ namespace Content.Server.GameObjects.Components.GUI
public override bool Drop(DragDropEventArgs args)
{
if (!args.User.TryGetComponent(out IActorComponent? actor)) return false;
if (!args.User.TryGetComponent(out ActorComponent? actor)) return false;
OpenUserInterface(actor.playerSession);
OpenUserInterface(actor.PlayerSession);
return true;
}
@@ -445,12 +445,12 @@ namespace Content.Server.GameObjects.Components.GUI
protected override void Activate(IEntity user, StrippableComponent component)
{
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
component.OpenUserInterface(actor.playerSession);
component.OpenUserInterface(actor.PlayerSession);
}
}
}

4
Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
View File

@@ -77,13 +77,13 @@ namespace Content.Server.GameObjects.Components.Gravity
bool IInteractHand.InteractHand(InteractHandEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent<IActorComponent>(out var actor))
if (!eventArgs.User.TryGetComponent<ActorComponent>(out var actor))
return false;
if (Status != GravityGeneratorStatus.Off && Status != GravityGeneratorStatus.On)
{
return false;
}
OpenUserInterface(actor.playerSession);
OpenUserInterface(actor.PlayerSession);
return true;
}

4
Content.Server/GameObjects/Components/Headset/HeadsetComponent.cs
View File

@@ -57,10 +57,10 @@ namespace Content.Server.GameObjects.Components.Headset
{
if (Owner.TryGetContainer(out var container))
{
if (!container.Owner.TryGetComponent(out IActorComponent? actor))
if (!container.Owner.TryGetComponent(out ActorComponent? actor))
return;
var playerChannel = actor.playerSession.ConnectedClient;
var playerChannel = actor.PlayerSession.ConnectedClient;
var msg = _netManager.CreateNetMessage<MsgChatMessage>();

16
Content.Server/GameObjects/Components/Instruments/InstrumentComponent.cs
View File

@@ -270,10 +270,10 @@ namespace Content.Server.GameObjects.Components.Instruments
void IHandSelected.HandSelected(HandSelectedEventArgs eventArgs)
{
if (eventArgs.User == null || !eventArgs.User.TryGetComponent(out BasicActorComponent? actor))
if (eventArgs.User == null || !eventArgs.User.TryGetComponent(out ActorComponent? actor))
return;
var session = actor.playerSession;
var session = actor.PlayerSession;
if (session.Status != SessionStatus.InGame) return;
@@ -289,21 +289,21 @@ namespace Content.Server.GameObjects.Components.Instruments
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (Handheld || !eventArgs.User.TryGetComponent(out IActorComponent? actor)) return;
if (Handheld || !eventArgs.User.TryGetComponent(out ActorComponent? actor)) return;
if (InstrumentPlayer != null) return;
InstrumentPlayer = actor.playerSession;
OpenUserInterface(actor.playerSession);
InstrumentPlayer = actor.PlayerSession;
OpenUserInterface(actor.PlayerSession);
}
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor)) return false;
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor)) return false;
if (InstrumentPlayer == actor.playerSession)
if (InstrumentPlayer == actor.PlayerSession)
{
OpenUserInterface(actor.playerSession);
OpenUserInterface(actor.PlayerSession);
}
return false;

2
Content.Server/GameObjects/Components/Items/Storage/ServerStorageComponent.cs
View File

@@ -246,7 +246,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage
PlaySoundCollection(StorageSoundCollection);
EnsureInitialCalculated();
var userSession = entity.GetComponent<BasicActorComponent>().playerSession;
var userSession = entity.GetComponent<ActorComponent>().PlayerSession;
Logger.DebugS(LoggerName, $"Storage (UID {Owner.Uid}) \"used\" by player session (UID {userSession.AttachedEntityUid}).");

4
Content.Server/GameObjects/Components/Kitchen/MicrowaveComponent.cs
View File

@@ -181,13 +181,13 @@ namespace Content.Server.GameObjects.Components.Kitchen
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor) || !Powered)
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor) || !Powered)
{
return;
}
_uiDirty = true;
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
}
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)

4
Content.Server/GameObjects/Components/Kitchen/ReagentGrinderComponent.cs
View File

@@ -256,12 +256,12 @@ namespace Content.Server.GameObjects.Components.Kitchen
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
_uiDirty = true;
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
}
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)

6
Content.Server/GameObjects/Components/MagicMirrorComponent.cs
View File

@@ -95,7 +95,7 @@ namespace Content.Server.GameObjects.Components
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -106,7 +106,7 @@ namespace Content.Server.GameObjects.Components
return;
}
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
var appearance = looks.Appearance;
@@ -121,7 +121,7 @@ namespace Content.Server.GameObjects.Components
looks.CanColorHair,
looks.CanColorFacialHair);
UserInterface?.SendMessage(msg, actor.playerSession);
UserInterface?.SendMessage(msg, actor.PlayerSession);
}
}
}

4
Content.Server/GameObjects/Components/Medical/MedicalScannerComponent.cs
View File

@@ -184,7 +184,7 @@ namespace Content.Server.GameObjects.Components.Medical
void IActivate.Activate(ActivateEventArgs args)
{
if (!args.User.TryGetComponent(out IActorComponent? actor))
if (!args.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -192,7 +192,7 @@ namespace Content.Server.GameObjects.Components.Medical
if (!Powered)
return;
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
[Verb]

2
Content.Server/GameObjects/Components/Morgue/MorgueEntityStorageComponent.cs
View File

@@ -116,7 +116,7 @@ namespace Content.Server.GameObjects.Components.Morgue
{
count++;
if (!hasMob && entity.HasComponent<IBody>()) hasMob = true;
if (!hasSoul && entity.TryGetComponent<BasicActorComponent>(out var actor) && actor.playerSession != null) hasSoul = true;
if (!hasSoul && entity.TryGetComponent<ActorComponent>(out var actor) && actor.PlayerSession != null) hasSoul = true;
}
Appearance?.SetData(MorgueVisuals.HasContents, count > 0);
Appearance?.SetData(MorgueVisuals.HasMob, hasMob);

10
Content.Server/GameObjects/Components/Observer/GhostComponent.cs
View File

@@ -82,15 +82,15 @@ namespace Content.Server.GameObjects.Components.Observer
{
case ReturnToBodyComponentMessage:
{
if (!Owner.TryGetComponent(out IActorComponent? actor) ||
if (!Owner.TryGetComponent(out ActorComponent? actor) ||
!CanReturnToBody)
{
break;
}
if (netChannel == actor.playerSession.ConnectedClient)
if (netChannel == actor.PlayerSession.ConnectedClient)
{
var o = actor.playerSession.ContentData()!.Mind;
var o = actor.PlayerSession.ContentData()!.Mind;
o?.UnVisit();
}
break;
@@ -122,7 +122,7 @@ namespace Content.Server.GameObjects.Components.Observer
break;
}
if (!Owner.TryGetComponent(out IActorComponent? actor))
if (!Owner.TryGetComponent(out ActorComponent? actor))
{
break;
}
@@ -133,7 +133,7 @@ namespace Content.Server.GameObjects.Components.Observer
break;
}
if (!_playerManager.TryGetSessionByChannel(actor.playerSession.ConnectedClient, out var player) ||
if (!_playerManager.TryGetSessionByChannel(actor.PlayerSession.ConnectedClient, out var player) ||
player.AttachedEntity != entity)
{
break;

6
Content.Server/GameObjects/Components/PA/ParticleAcceleratorControlBoxComponent.cs
View File

@@ -220,14 +220,14 @@ namespace Content.Server.GameObjects.Components.PA
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
if (Owner.TryGetComponent<WiresComponent>(out var wires) && wires.IsPanelOpen)
{
wires.OpenInterface(actor.playerSession);
wires.OpenInterface(actor.PlayerSession);
}
else
{
@@ -236,7 +236,7 @@ namespace Content.Server.GameObjects.Components.PA
return;
}
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
UpdateUI();
}
}

8
Content.Server/GameObjects/Components/PDA/PDAComponent.cs
View File

@@ -271,23 +271,23 @@ namespace Content.Server.GameObjects.Components.PDA
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
UpdatePDAAppearance();
}
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return false;
}
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
UpdatePDAAppearance();
return true;
}

8
Content.Server/GameObjects/Components/Paper/PaperComponent.cs
View File

@@ -47,12 +47,12 @@ namespace Content.Server.GameObjects.Components.Paper
bool IUse.UseEntity(UseEntityEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
return false;
_mode = PaperAction.Read;
UpdateUserInterface();
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
return true;
}
@@ -77,12 +77,12 @@ namespace Content.Server.GameObjects.Components.Paper
{
if (!eventArgs.Using.HasTag("Write"))
return false;
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
return false;
_mode = PaperAction.Write;
UpdateUserInterface();
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
return true;
}
}

4
Content.Server/GameObjects/Components/Power/AME/AMEControllerComponent.cs
View File

@@ -114,7 +114,7 @@ namespace Content.Server.GameObjects.Components.Power.AME
/// <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;
}
@@ -128,7 +128,7 @@ namespace Content.Server.GameObjects.Components.Power.AME
var activeHandEntity = hands.GetActiveHand?.Owner;
if (activeHandEntity == null)
{
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
}

4
Content.Server/GameObjects/Components/Power/ApcNetComponents/ApcComponent.cs
View File

@@ -195,12 +195,12 @@ namespace Content.Server.GameObjects.Components.Power.ApcNetComponents
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);
}
}
}

4
Content.Server/GameObjects/Components/Power/PowerNetComponents/SolarControlConsoleComponent.cs
View File

@@ -59,7 +59,7 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -71,7 +71,7 @@ namespace Content.Server.GameObjects.Components.Power.PowerNetComponents
// always update the UI immediately before opening, just in case
UpdateUIState();
UserInterface?.Open(actor.playerSession);
UserInterface?.Open(actor.PlayerSession);
}
}
}

4
Content.Server/GameObjects/Components/Research/LatheComponent.cs
View File

@@ -138,14 +138,14 @@ namespace Content.Server.GameObjects.Components.Research
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
return;
if (!Powered)
{
return;
}
OpenUserInterface(actor.playerSession);
OpenUserInterface(actor.PlayerSession);
}
async Task<bool> IInteractUsing.InteractUsing(InteractUsingEventArgs eventArgs)

4
Content.Server/GameObjects/Components/Research/ResearchClientComponent.cs
View File

@@ -59,10 +59,10 @@ namespace Content.Server.GameObjects.Components.Research
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
return;
OpenUserInterface(actor.playerSession);
OpenUserInterface(actor.PlayerSession);
}
public void UpdateUserInterface()

4
Content.Server/GameObjects/Components/Research/ResearchConsoleComponent.cs
View File

@@ -110,14 +110,14 @@ namespace Content.Server.GameObjects.Components.Research
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if (!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (!eventArgs.User.TryGetComponent(out ActorComponent? actor))
return;
if (!Powered)
{
return;
}
OpenUserInterface(actor.playerSession);
OpenUserInterface(actor.PlayerSession);
PlayKeyboardSound();
}

6
Content.Server/GameObjects/Components/VendingMachines/VendingMachineComponent.cs
View File

@@ -52,7 +52,7 @@ namespace Content.Server.GameObjects.Components.VendingMachines
void IActivate.Activate(ActivateEventArgs eventArgs)
{
if(!eventArgs.User.TryGetComponent(out IActorComponent? actor))
if(!eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -62,10 +62,10 @@ namespace Content.Server.GameObjects.Components.VendingMachines
var wires = Owner.GetComponent<WiresComponent>();
if (wires.IsPanelOpen)
{
wires.OpenInterface(actor.playerSession);
wires.OpenInterface(actor.PlayerSession);
} else
{
UserInterface?.Toggle(actor.playerSession);
UserInterface?.Toggle(actor.PlayerSession);
}
}

4
Content.Server/GameObjects/Components/WiresComponent.cs
View File

@@ -489,9 +489,9 @@ namespace Content.Server.GameObjects.Components
(tool.HasQuality(ToolQuality.Cutting) ||
tool.HasQuality(ToolQuality.Multitool)))
{
if (eventArgs.User.TryGetComponent(out IActorComponent? actor))
if (eventArgs.User.TryGetComponent(out ActorComponent? actor))
{
OpenInterface(actor.playerSession);
OpenInterface(actor.PlayerSession);
return true;
}
}

2
Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
View File

@@ -192,7 +192,7 @@ namespace Content.Server.GameObjects.EntitySystems.Click
/// <param name="uid"></param>
internal void UseItemInHand(IEntity entity, EntityCoordinates coords, EntityUid uid)
{
if (entity.HasComponent<BasicActorComponent>())
if (entity.HasComponent<ActorComponent>())
{
throw new InvalidOperationException();
}

4
Content.Server/GameObjects/EntitySystems/CloningSystem.cs
View File

@@ -49,12 +49,12 @@ namespace Content.Server.GameObjects.EntitySystems
private void HandleActivate(EntityUid uid, CloningPodComponent component, ActivateInWorldMessage args)
{
if (!component.Powered ||
!args.User.TryGetComponent(out IActorComponent? actor))
!args.User.TryGetComponent(out ActorComponent? actor))
{
return;
}
component.UserInterface?.Open(actor.playerSession);
component.UserInterface?.Open(actor.PlayerSession);
}
private void HandleMindAdded(EntityUid uid, BeingClonedComponent component, MindAddedMessage message)

8
Content.Server/GlobalVerbs/AttachToGrandparentVerb.cs
View File

@@ -20,13 +20,13 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "attachtograndparent"))
if (!groupController.CanCommand(actor.PlayerSession, "attachtograndparent"))
{
return;
}
@@ -38,13 +38,13 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "attachtograndparent"))
if (!groupController.CanCommand(actor.PlayerSession, "attachtograndparent"))
{
return;
}

8
Content.Server/GlobalVerbs/AttachToGridVerb.cs
View File

@@ -19,13 +19,13 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "attachtogrid"))
if (!groupController.CanCommand(actor.PlayerSession, "attachtogrid"))
{
return;
}
@@ -37,13 +37,13 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "attachtogrid"))
if (!groupController.CanCommand(actor.PlayerSession, "attachtogrid"))
{
return;
}

8
Content.Server/GlobalVerbs/AttachToSelf.cs
View File

@@ -19,13 +19,13 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "attachtoself"))
if (!groupController.CanCommand(actor.PlayerSession, "attachtoself"))
{
return;
}
@@ -37,13 +37,13 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "attachtoself"))
if (!groupController.CanCommand(actor.PlayerSession, "attachtoself"))
{
return;
}

6
Content.Server/GlobalVerbs/ControlMobVerb.cs
View File

@@ -26,14 +26,14 @@ namespace Content.Server.GlobalVerbs
return;
}
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (!user.HasComponent<MindComponent>() || !target.HasComponent<MindComponent>())
{
return;
}
if (groupController.CanCommand(player.playerSession, "controlmob"))
if (groupController.CanCommand(player.PlayerSession, "controlmob"))
{
data.Visibility = VerbVisibility.Visible;
data.Text = Loc.GetString("Control Mob");
@@ -46,7 +46,7 @@ namespace Content.Server.GlobalVerbs
{
var groupController = IoCManager.Resolve<IConGroupController>();
var player = user.GetComponent<IActorComponent>().playerSession;
var player = user.GetComponent<ActorComponent>().PlayerSession;
if (!groupController.CanCommand(player, "controlmob"))
{
return;

8
Content.Server/GlobalVerbs/DeleteVerb.cs
View File

@@ -20,12 +20,12 @@ namespace Content.Server.GlobalVerbs
var groupController = IoCManager.Resolve<IConGroupController>();
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
if (!groupController.CanCommand(actor.playerSession, "deleteentity"))
if (!groupController.CanCommand(actor.PlayerSession, "deleteentity"))
{
return;
}
@@ -40,12 +40,12 @@ namespace Content.Server.GlobalVerbs
{
var groupController = IoCManager.Resolve<IConGroupController>();
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
if (!groupController.CanCommand(actor.playerSession, "deleteentity"))
if (!groupController.CanCommand(actor.PlayerSession, "deleteentity"))
{
return;
}

8
Content.Server/GlobalVerbs/InRangeUnoccludedVerb.cs
View File

@@ -18,13 +18,13 @@ namespace Content.Server.GlobalVerbs
{
data.Visibility = VerbVisibility.Invisible;
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "inrangeunoccluded"))
if (!groupController.CanCommand(actor.PlayerSession, "inrangeunoccluded"))
{
return;
}
@@ -36,13 +36,13 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(actor.playerSession, "inrangeunoccluded"))
if (!groupController.CanCommand(actor.PlayerSession, "inrangeunoccluded"))
{
return;
}

10
Content.Server/GlobalVerbs/MakeGhostRoleVerb.cs
View File

@@ -28,8 +28,8 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent? actor) ||
!groupController.CanCommand(actor.playerSession, "makeghostrole"))
if (!user.TryGetComponent(out ActorComponent? actor) ||
!groupController.CanCommand(actor.PlayerSession, "makeghostrole"))
{
return;
}
@@ -49,14 +49,14 @@ namespace Content.Server.GlobalVerbs
return;
}
if (!user.TryGetComponent(out IActorComponent? actor) ||
!groupController.CanCommand(actor.playerSession, "makeghostrole"))
if (!user.TryGetComponent(out ActorComponent? actor) ||
!groupController.CanCommand(actor.PlayerSession, "makeghostrole"))
{
return;
}
var ghostRoleSystem = EntitySystem.Get<GhostRoleSystem>();
ghostRoleSystem.OpenMakeGhostRoleEui(actor.playerSession, target.Uid);
ghostRoleSystem.OpenMakeGhostRoleEui(actor.PlayerSession, target.Uid);
}
}
}

4
Content.Server/GlobalVerbs/MakeSentientVerb.cs
View File

@@ -25,7 +25,7 @@ namespace Content.Server.GlobalVerbs
if (user == target || target.HasComponent<MindComponent>())
return;
var player = user.GetComponent<IActorComponent>().playerSession;
var player = user.GetComponent<ActorComponent>().PlayerSession;
if (groupController.CanCommand(player, "makesentient"))
{
data.Visibility = VerbVisibility.Visible;
@@ -39,7 +39,7 @@ namespace Content.Server.GlobalVerbs
{
var groupController = IoCManager.Resolve<IConGroupController>();
var player = user.GetComponent<IActorComponent>().playerSession;
var player = user.GetComponent<ActorComponent>().PlayerSession;
if (!groupController.CanCommand(player, "makesentient"))
return;

6
Content.Server/GlobalVerbs/PointingVerb.cs
View File

@@ -20,7 +20,7 @@ namespace Content.Server.GlobalVerbs
data.Visibility = VerbVisibility.Invisible;
data.IconTexture = "/Textures/Interface/VerbIcons/point.svg.192dpi.png";
if (!user.HasComponent<IActorComponent>())
if (!user.HasComponent<ActorComponent>())
{
return;
}
@@ -42,12 +42,12 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (!user.TryGetComponent(out IActorComponent? actor))
if (!user.TryGetComponent(out ActorComponent? actor))
{
return;
}
EntitySystem.Get<PointingSystem>().TryPoint(actor.playerSession, target.Transform.Coordinates, target.Uid);
EntitySystem.Get<PointingSystem>().TryPoint(actor.PlayerSession, target.Transform.Coordinates, target.Uid);
}
}
}

8
Content.Server/GlobalVerbs/RejuvenateVerb.cs
View File

@@ -30,7 +30,7 @@ namespace Content.Server.GlobalVerbs
var groupController = IoCManager.Resolve<IConGroupController>();
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (!target.HasComponent<IDamageableComponent>() && !target.HasComponent<HungerComponent>() &&
!target.HasComponent<ThirstComponent>())
@@ -38,7 +38,7 @@ namespace Content.Server.GlobalVerbs
return;
}
if (groupController.CanCommand(player.playerSession, "rejuvenate"))
if (groupController.CanCommand(player.PlayerSession, "rejuvenate"))
{
data.Visibility = VerbVisibility.Visible;
}
@@ -48,9 +48,9 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
var groupController = IoCManager.Resolve<IConGroupController>();
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (groupController.CanCommand(player.playerSession, "rejuvenate"))
if (groupController.CanCommand(player.PlayerSession, "rejuvenate"))
PerformRejuvenate(target);
}
}

8
Content.Server/GlobalVerbs/SetAnchorVerb.cs
View File

@@ -21,14 +21,14 @@ namespace Content.Server.GlobalVerbs
var groupController = IoCManager.Resolve<IConGroupController>();
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
if (!target.TryGetComponent(out PhysicsComponent? physics))
{
return;
}
if (groupController.CanCommand(player.playerSession, "setanchor"))
if (groupController.CanCommand(player.PlayerSession, "setanchor"))
{
data.Text = physics.Anchored ? "Unanchor" : "Anchor";
data.Visibility = VerbVisibility.Visible;
@@ -38,10 +38,10 @@ namespace Content.Server.GlobalVerbs
public override void Activate(IEntity user, IEntity target)
{
if (user.TryGetComponent<IActorComponent>(out var player))
if (user.TryGetComponent<ActorComponent>(out var player))
{
var groupController = IoCManager.Resolve<IConGroupController>();
if (!groupController.CanCommand(player.playerSession, "setanchor"))
if (!groupController.CanCommand(player.PlayerSession, "setanchor"))
return;
if (target.TryGetComponent(out PhysicsComponent? physics))

4
Content.Server/Mobs/Mind.cs
View File

@@ -213,10 +213,10 @@ namespace Content.Server.Mobs
throw new ArgumentException("That entity already has a mind.", nameof(entity));
}
if (entity.TryGetComponent(out IActorComponent? actor))
if (entity.TryGetComponent(out ActorComponent? actor))
{
// Happens when transferring to your currently visited entity.
if (actor.playerSession != Session)
if (actor.PlayerSession != Session)
{
throw new ArgumentException("Visit target already has a session.", nameof(entity));
}

2
Content.Server/Physics/Controllers/SingularityController.cs
View File

@@ -47,7 +47,7 @@ namespace Content.Server.Physics.Controllers
foreach (var (singularity, physics) in ComponentManager.EntityQuery<ServerSingularityComponent, PhysicsComponent>())
{
if (singularity.Owner.HasComponent<BasicActorComponent>()) continue;
if (singularity.Owner.HasComponent<ActorComponent>()) continue;
// TODO: Need to essentially use a push vector in a random direction for us PLUS
// Any entity colliding with our larger circlebox needs to have an impulse applied to itself.

12
Content.Server/ServerNotifyManager.cs
View File

@@ -28,7 +28,7 @@ namespace Content.Server
public override void PopupMessage(IEntity source, IEntity viewer, string message)
{
if (!viewer.TryGetComponent(out IActorComponent? actor))
if (!viewer.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -37,12 +37,12 @@ namespace Content.Server
netMessage.Entity = source.Uid;
netMessage.Message = message;
_netManager.ServerSendMessage(netMessage, actor.playerSession.ConnectedClient);
_netManager.ServerSendMessage(netMessage, actor.PlayerSession.ConnectedClient);
}
public override void PopupMessage(EntityCoordinates coordinates, IEntity viewer, string message)
{
if (!viewer.TryGetComponent(out IActorComponent? actor))
if (!viewer.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -51,12 +51,12 @@ namespace Content.Server
netMessage.Coordinates = coordinates;
netMessage.Message = message;
_netManager.ServerSendMessage(netMessage, actor.playerSession.ConnectedClient);
_netManager.ServerSendMessage(netMessage, actor.PlayerSession.ConnectedClient);
}
public override void PopupMessageCursor(IEntity viewer, string message)
{
if (!viewer.TryGetComponent(out IActorComponent? actor))
if (!viewer.TryGetComponent(out ActorComponent? actor))
{
return;
}
@@ -64,7 +64,7 @@ namespace Content.Server
var netMessage = _netManager.CreateNetMessage<MsgDoNotifyCursor>();
netMessage.Message = message;
_netManager.ServerSendMessage(netMessage, actor.playerSession.ConnectedClient);
_netManager.ServerSendMessage(netMessage, actor.PlayerSession.ConnectedClient);
}
}
}