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

Fix 3000 errors

Browse Source
This commit is contained in:
DrSmugleaf
2021-12-05 18:09:01 +01:00
parent 2bfec7ec62
commit 2a3b7d809d
569 changed files with 2979 additions and 3280 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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, out SharedPullableComponent playerPullable))
if (playerTarget != default && IoCManager.Resolve<IEntityManager>().TryGetComponent(playerTarget, out SharedPullableComponent playerPullable))
{
ps.TryStopPull(playerPullable);
}

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, out ServerAlertsComponent? alertsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(attachedEntity.Value, out ServerAlertsComponent? alertsComponent))
{
shell.WriteLine("user has no alerts component");
return;

4
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, out ServerAlertsComponent? alertsComponent))
if (!IoCManager.Resolve<IEntityManager>().TryGetComponent(attachedEntity.Value, out ServerAlertsComponent? alertsComponent))
{
shell.WriteLine("user has no alerts component");
return;
@@ -59,7 +59,7 @@ namespace Content.Server.Alert.Commands
shell.WriteLine("invalid severity " + sevint);
return;
}
alertsComponent.ShowAlert(alert.AlertType, sevint == -1 ? (short?) null : sevint);
alertsComponent.ShowAlert(alert.AlertType, sevint == -1 ? null : sevint);
}
}
}

4
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).EntityName, msg.Type);
IoCManager.Resolve<IEntityManager>().GetComponent<MetaDataComponent>(player.Value).EntityName, msg.Type);
break;
}
@@ -77,7 +77,7 @@ namespace Content.Server.Alert
break;
}
alert.OnClick?.AlertClicked(new ClickAlertEventArgs(player, alert));
alert.OnClick?.AlertClicked(new ClickAlertEventArgs(player.Value, alert));
break;
}
}