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

Enable nullability in Content.Server (#3685)

Browse Source
This commit is contained in:
DrSmugleaf
2021-03-16 15:50:20 +01:00
committed by GitHub
parent 90fec0ed24
commit a5ade526b7
306 changed files with 1616 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Content.Server/Commands/Chat/AdminChatCommand.cs
View File

@@ -17,7 +17,14 @@ namespace Content.Server.Commands.Chat
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
var player = (IPlayerSession?) shell.Player;
if (player == null)
{
shell.WriteError("You can't run this command locally.");
return;
}
if (args.Length < 1)
return;

8
Content.Server/Commands/Chat/MeCommand.cs
View File

@@ -40,7 +40,13 @@ namespace Content.Server.Commands.Chat
if (mindComponent == null)
{
shell.WriteLine("You don't have a mind!");
shell.WriteError("You don't have a mind!");
return;
}
if (mindComponent.OwnedEntity == null)
{
shell.WriteError("You don't have an entity!");
return;
}

9
Content.Server/Commands/Chat/OOCCommand.cs
View File

@@ -16,7 +16,14 @@ namespace Content.Server.Commands.Chat
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
var player = (IPlayerSession?) shell.Player;
if (player == null)
{
shell.WriteError("You can't run this command locally.");
return;
}
if (args.Length < 1)
return;

8
Content.Server/Commands/Chat/SayCommand.cs
View File

@@ -53,7 +53,13 @@ namespace Content.Server.Commands.Chat
if (mindComponent == null)
{
shell.WriteLine("You don't have a mind!");
shell.WriteError("You don't have a mind!");
return;
}
if (mindComponent.OwnedEntity == null)
{
shell.WriteError("You don't have an entity!");
return;
}

2
Content.Server/Commands/Chat/SuicideCommand.cs
View File

@@ -69,7 +69,7 @@ namespace Content.Server.Commands.Chat
return;
var chat = IoCManager.Resolve<IChatManager>();
var owner = player.ContentData()?.Mind?.OwnedComponent.Owner;
var owner = player.ContentData()?.Mind?.OwnedComponent?.Owner;
if (owner == null)
{

4
Content.Server/Commands/GameTicking/JoinGameCommand.cs
View File

@@ -49,11 +49,11 @@ namespace Content.Server.Commands.GameTicking
shell.WriteLine($"{jobPrototype.Name} has no available slots.");
return;
}
ticker.MakeJoinGame(player, args[0].ToString());
ticker.MakeJoinGame(player, args[0]);
return;
}
ticker.MakeJoinGame(player, null);
ticker.MakeJoinGame(player);
}
}
}

2
Content.Server/Commands/GameTicking/RespawnCommand.cs
View File

@@ -50,7 +50,7 @@ namespace Content.Server.Commands.GameTicking
return;
}
data.ContentData().WipeMind();
data.ContentData()?.WipeMind();
shell.WriteLine("Player is not currently online, but they will respawn if they come back online");
return;
}

2
Content.Server/Commands/GameTicking/TileWallsCommand.cs
View File

@@ -90,7 +90,7 @@ namespace Content.Server.Commands.GameTicking
continue;
}
if (!childEntity.TryGetComponent(out SnapGridComponent snapGrid))
if (!childEntity.TryGetComponent(out SnapGridComponent? snapGrid))
{
continue;
}

9
Content.Server/Commands/MachineLinking/SignalLinkerCommand.cs
View File

@@ -19,7 +19,14 @@ namespace Content.Server.Commands.MachineLinking
public void Execute(IConsoleShell shell, string argStr, string[] args)
{
var player = shell.Player as IPlayerSession;
var player = (IPlayerSession?) shell.Player;
if (player == null)
{
shell.WriteError("This command cannot be run locally.");
return;
}
bool? enable = null;
if (args.Length > 0)
{

21
Content.Server/Commands/Mobs/AddRoleCommand.cs
View File

@@ -30,16 +30,21 @@ namespace Content.Server.Commands.Mobs
}
var mgr = IoCManager.Resolve<IPlayerManager>();
if (mgr.TryGetPlayerDataByUsername(args[0], out var data))
{
var mind = data.ContentData().Mind;
var role = new Job(mind, _prototypeManager.Index<JobPrototype>(args[1]));
mind.AddRole(role);
}
else
if (!mgr.TryGetPlayerDataByUsername(args[0], out var data))
{
shell.WriteLine("Can't find that mind");
return;
}
var mind = data.ContentData()?.Mind;
if (mind == null)
{
shell.WriteLine("Can't find that mind");
return;
}
var role = new Job(mind, _prototypeManager.Index<JobPrototype>(args[1]));
mind.AddRole(role);
}
}
}
}

35
Content.Server/Commands/Mobs/MindInfoCommand.cs
View File

@@ -26,23 +26,28 @@ namespace Content.Server.Commands.Mobs
}
var mgr = IoCManager.Resolve<IPlayerManager>();
if (mgr.TryGetSessionByUsername(args[0], out var data))
{
var mind = data.ContentData().Mind;
var builder = new StringBuilder();
builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedComponent?.Owner?.Uid);
foreach (var role in mind.AllRoles)
{
builder.AppendFormat("{0} ", role.Name);
}
shell.WriteLine(builder.ToString());
}
else
if (!mgr.TryGetSessionByUsername(args[0], out var data))
{
shell.WriteLine("Can't find that mind");
return;
}
var mind = data.ContentData()?.Mind;
if (mind == null)
{
shell.WriteLine("Can't find that mind");
return;
}
var builder = new StringBuilder();
builder.AppendFormat("player: {0}, mob: {1}\nroles: ", mind.UserId, mind.OwnedComponent?.Owner?.Uid);
foreach (var role in mind.AllRoles)
{
builder.AppendFormat("{0} ", role.Name);
}
shell.WriteLine(builder.ToString());
}
}
}
}

22
Content.Server/Commands/Mobs/RemoveRoleCommand.cs
View File

@@ -30,16 +30,22 @@ namespace Content.Server.Commands.Mobs
}
var mgr = IoCManager.Resolve<IPlayerManager>();
if (mgr.TryGetPlayerDataByUsername(args[0], out var data))
{
var mind = data.ContentData().Mind;
var role = new Job(mind, _prototypeManager.Index<JobPrototype>(args[1]));
mind.RemoveRole(role);
}
else
if (!mgr.TryGetPlayerDataByUsername(args[0], out var data))
{
shell.WriteLine("Can't find that mind");
return;
}
var mind = data.ContentData()?.Mind;
if (mind == null)
{
shell.WriteLine("Can't find that mind");
return;
}
var role = new Job(mind, _prototypeManager.Index<JobPrototype>(args[1]));
mind.RemoveRole(role);
}
}
}
}