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

7
Content.Server/Verbs/Commands/InvokeVerbCommand.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Linq;
using System.Net.Security;
using Content.Server.Administration;
using Content.Shared.Administration;
using Content.Shared.Verbs;
@@ -30,7 +29,7 @@ namespace Content.Server.Verbs.Commands
var verbSystem = EntitySystem.Get<SharedVerbSystem>();
// get the 'player' entity (defaulting to command user, otherwise uses a uid)
IEntity? playerEntity = null;
EntityUid playerEntity = null;
if (!int.TryParse(args[0], out var intPlayerUid))
{
if (args[0] == "self" && shell.Player?.AttachedEntity != null)
@@ -45,7 +44,7 @@ namespace Content.Server.Verbs.Commands
}
else
{
entityManager.TryGetEntity(new EntityUid(intPlayerUid), out playerEntity);
entityManager.EntityExists(new EntityUid(intPlayerUid));
}
// gets the target entity
@@ -62,7 +61,7 @@ namespace Content.Server.Verbs.Commands
}
var entUid = new EntityUid(intUid);
if (!entityManager.TryGetEntity(entUid, out var target))
if (!entityManager.EntityExists(entUid)
{
shell.WriteError(Loc.GetString("invoke-verb-command-invalid-target-entity"));
return;

6
Content.Server/Verbs/Commands/ListVerbsCommand.cs
View File

@@ -27,7 +27,7 @@ namespace Content.Server.Verbs.Commands
var verbSystem = EntitySystem.Get<SharedVerbSystem>();
// get the 'player' entity (defaulting to command user, otherwise uses a uid)
IEntity? playerEntity = null;
EntityUid playerEntity = null;
if (!int.TryParse(args[0], out var intPlayerUid))
{
if (args[0] == "self" && shell.Player?.AttachedEntity != null)
@@ -42,7 +42,7 @@ namespace Content.Server.Verbs.Commands
}
else
{
entityManager.TryGetEntity(new EntityUid(intPlayerUid), out playerEntity);
entityManager.EntityExists(new EntityUid(intPlayerUid));
}
// gets the target entity
@@ -59,7 +59,7 @@ namespace Content.Server.Verbs.Commands
}
var entUid = new EntityUid(intUid);
if (!entityManager.TryGetEntity(entUid, out var target))
if (!entityManager.EntityExists(entUid)
{
shell.WriteError(Loc.GetString("list-verbs-command-invalid-target-entity"));
return;

5
Content.Server/Verbs/VerbSystem.cs
View File

@@ -1,7 +1,6 @@
using Content.Shared.Verbs;
using Robust.Server.Player;
using Robust.Shared.GameObjects;
using Robust.Shared.IoC;
using Robust.Shared.Log;
namespace Content.Server.Verbs
@@ -30,7 +29,7 @@ namespace Content.Server.Verbs
return;
}
if (!EntityManager.TryGetEntity(args.Target, out var targetEntity))
if (!EntityManager.EntityExists(args.Target)
{
return;
}
@@ -56,7 +55,7 @@ namespace Content.Server.Verbs
{
var player = (IPlayerSession) eventArgs.SenderSession;
if (!EntityManager.TryGetEntity(args.EntityUid, out var target))
if (!EntityManager.EntityExists(args.EntityUid)
{
Logger.Warning($"{nameof(HandleVerbRequest)} called on a non-existent entity with id {args.EntityUid} by player {player}.");
return;