themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Refactor for fail fast approach

Browse source
This commit is contained in:
stacey 2021-08-02 11:15:21 -04:00 • committed by GitHub
parent f4c2ab80c9
commit aa4b735163
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
TShockAPI/Commands.cs
View file

@ -5666,6 +5666,11 @@ namespace TShockAPI
private static void Respawn(CommandArgs args)
{
if (!args.Player.RealPlayer)
{
args.Player.SendErrorMessage("You can't respawn the server console!");
return;
}
TSPlayer playerToRespawn;
if (args.Parameters.Count > 0)
{
@ -5681,20 +5686,14 @@ namespace TShockAPI
args.Player.SendErrorMessage($"Could not find any player named \"{plStr}\"");
return;
}
else if (players.Count > 1)
if (players.Count > 1)
{
args.Player.SendMultipleMatchError(players.Select(p => p.Name));
return;
}
else
playerToRespawn = players[0];
playerToRespawn = players[0];
}
else if (!args.Player.RealPlayer)
{
args.Player.SendErrorMessage("You can't respawn the server console!");
return;
}
else
else
playerToRespawn = args.Player;
if (!playerToRespawn.Dead)
@ -5702,8 +5701,7 @@ namespace TShockAPI
args.Player.SendErrorMessage($"{(playerToRespawn == args.Player ? "You" : playerToRespawn.Name)} {(playerToRespawn == args.Player ? "are" : "is")} not dead.");
return;
}
else
playerToRespawn.Spawn(PlayerSpawnContext.ReviveFromDeath);
playerToRespawn.Spawn(PlayerSpawnContext.ReviveFromDeath);
if (playerToRespawn != args.Player)
{