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

Inline UID

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-12-03 15:53:09 +01:00
parent 2654775bf0
commit 5cd42c9ad6
803 changed files with 3613 additions and 3577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.Server/Alert/Click/RemoveCuffs.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Alert.Click
{
public void AlertClicked(ClickAlertEventArgs args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player.Uid, out CuffableComponent? cuffableComponent))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player, out CuffableComponent? cuffableComponent))
{
cuffableComponent.TryUncuff(args.Player);
}

4
Content.Server/Alert/Click/ResistFire.cs
View File

@@ -17,9 +17,9 @@ namespace Content.Server.Alert.Click
{
public void AlertClicked(ClickAlertEventArgs args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player.Uid, out FlammableComponent? flammable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player, out FlammableComponent? flammable))
{
EntitySystem.Get<FlammableSystem>().Resist(args.Player.Uid, flammable);
EntitySystem.Get<FlammableSystem>().Resist(args.Player, flammable);
}
}
}

4
Content.Server/Alert/Click/StopBeingPulled.cs
View File

@@ -18,10 +18,10 @@ namespace Content.Server.Alert.Click
{
public void AlertClicked(ClickAlertEventArgs args)
{
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(args.Player.Uid))
if (!EntitySystem.Get<ActionBlockerSystem>().CanInteract(args.Player))
return;
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullableComponent?>(args.Player.Uid, out var playerPullable))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent<SharedPullableComponent?>(args.Player, out var playerPullable))
{
EntitySystem.Get<SharedPullingSystem>().TryStopPull(playerPullable);
}

2
Content.Server/Alert/Click/StopPiloting.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.Alert.Click
{
public void AlertClicked(ClickAlertEventArgs args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player.Uid, out PilotComponent? pilotComponent) &&
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player, out PilotComponent? pilotComponent) &&
pilotComponent.Console != null)
{
EntitySystem.Get<ShuttleConsoleSystem>().RemovePilot(pilotComponent);

2
Content.Server/Alert/Click/StopPulling.cs
View File

@@ -19,7 +19,7 @@ namespace Content.Server.Alert.Click
{
var ps = EntitySystem.Get<SharedPullingSystem>();
var playerTarget = ps.GetPulled(args.Player);
if (playerTarget != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(playerTarget.Uid, out SharedPullableComponent playerPullable))
if (playerTarget != null && IoCManager.Resolve<IEntityManager>().TryGetComponent(playerTarget, out SharedPullableComponent playerPullable))
{
ps.TryStopPull(playerPullable);
}

2
Content.Server/Alert/Click/Unbuckle.cs
View File

@@ -16,7 +16,7 @@ namespace Content.Server.Alert.Click
{
public void AlertClicked(ClickAlertEventArgs args)
{
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player.Uid, out BuckleComponent? buckle))
if (IoCManager.Resolve<IEntityManager>().TryGetComponent(args.Player, out BuckleComponent? buckle))
{
buckle.TryUnbuckle(args.Player);
}

2
Content.Server/Alert/Commands/ClearAlert.cs
View File

@@ -34,7 +34,7 @@ namespace Content.Server.Alert.Commands
if (!CommandUtils.TryGetAttachedEntityByUsernameOrId(shell, target, player, out attachedEntity)) return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(attachedEntity.Uid, out ServerAlertsComponent? alertsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(attachedEntity, out ServerAlertsComponent? alertsComponent))
{
shell.WriteLine("user has no alerts component");
return;

2
Content.Server/Alert/Commands/ShowAlert.cs
View File

@@ -40,7 +40,7 @@ namespace Content.Server.Alert.Commands
if (!CommandUtils.TryGetAttachedEntityByUsernameOrId(shell, target, player, out attachedEntity)) return;
}
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(attachedEntity.Uid, out ServerAlertsComponent? alertsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(attachedEntity, out ServerAlertsComponent? alertsComponent))
{
shell.WriteLine("user has no alerts component");
return;

2
Content.Server/Alert/ServerAlertsComponent.cs
View File

@@ -67,7 +67,7 @@ namespace Content.Server.Alert
{
Logger.DebugS("alert", "user {0} attempted to" +
" click alert {1} which is not currently showing for them",
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(player.Uid).EntityName, msg.Type);
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(player).EntityName, msg.Type);
break;
}