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

Use same TSPlayer.Active check

Browse source
This commit is contained in:
SGKoishi 2022-12-12 17:15:34 -08:00
parent c6b60e22d7
commit 59f9440d17
No known key found for this signature in database
GPG key ID: 8FFC399070653828
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/Bouncer.cs
View file

@ -1878,7 +1878,7 @@ namespace TShockAPI
return; return;
} }
if (TShock.Players[id] == null) if (TShock.Players[id] == null || !TShock.Players[id].Active)
{ {
TShock.Log.ConsoleDebug(GetString( TShock.Log.ConsoleDebug(GetString(
"Bouncer / OnPlayerBuff rejected {0} ({1}) applying buff {2} to {3} for {4} ticks: target is null", args.Player.Name, "Bouncer / OnPlayerBuff rejected {0} ({1}) applying buff {2} to {3} for {4} ticks: target is null", args.Player.Name,
@ -2081,7 +2081,7 @@ namespace TShockAPI
short amount = args.Amount; short amount = args.Amount;
byte plr = args.TargetPlayerIndex; byte plr = args.TargetPlayerIndex;
if (amount <= 0 || Main.player[plr] == null || !Main.player[plr].active) if (amount <= 0 || TShock.Players[plr] == null || !TShock.Players[plr].Active)
{ {
TShock.Log.ConsoleDebug(GetString("Bouncer / OnHealOtherPlayer rejected null checks")); TShock.Log.ConsoleDebug(GetString("Bouncer / OnHealOtherPlayer rejected null checks"));
args.Handled = true; args.Handled = true;
@ -2589,7 +2589,7 @@ namespace TShockAPI
byte direction = args.Direction; byte direction = args.Direction;
PlayerDeathReason reason = args.PlayerDeathReason; PlayerDeathReason reason = args.PlayerDeathReason;
if (id >= Main.maxPlayers || TShock.Players[id] == null) if (id >= Main.maxPlayers || TShock.Players[id] == null || !TShock.Players[id].Active)
{ {
TShock.Log.ConsoleDebug(GetString("Bouncer / OnPlayerDamage rejected null check")); TShock.Log.ConsoleDebug(GetString("Bouncer / OnPlayerDamage rejected null check"));
args.Handled = true; args.Handled = true;

8
TShockAPI/Commands.cs
View file

@ -3070,12 +3070,12 @@ namespace TShockAPI
args.Player.SendErrorMessage(GetString("You do not have permission to teleport all other players.")); args.Player.SendErrorMessage(GetString("You do not have permission to teleport all other players."));
return; return;
} }
for (int i = 0; i < Main.maxPlayers; i++) foreach (var player in TShock.Players)
{ {
if (Main.player[i].active && (Main.player[i] != args.TPlayer)) if (player != null && player.Active && player.Index != args.Player.Index)
{ {
if (TShock.Players[i].Teleport(args.TPlayer.position.X, args.TPlayer.position.Y)) if (player.Teleport(args.TPlayer.position.X, args.TPlayer.position.Y))
TShock.Players[i].SendSuccessMessage(GetString("You were teleported to {0}.", args.Player.Name)); player.SendSuccessMessage(GetString("You were teleported to {0}.", args.Player.Name));
} }
} }
args.Player.SendSuccessMessage(GetString("Teleported everyone to yourself.")); args.Player.SendSuccessMessage(GetString("Teleported everyone to yourself."));

6
TShockAPI/Rest/RestManager.cs
View file

@ -402,7 +402,7 @@ namespace TShockAPI
{"serverversion", Main.versionNumber}, {"serverversion", Main.versionNumber},
{"tshockversion", TShock.VersionNum}, {"tshockversion", TShock.VersionNum},
{"port", TShock.Config.Settings.ServerPort}, {"port", TShock.Config.Settings.ServerPort},
{"playercount", Main.player.Where(p => null != p && p.active).Count()}, {"playercount", TShock.Utils.GetActivePlayerCount()},
{"maxplayers", TShock.Config.Settings.MaxSlots}, {"maxplayers", TShock.Config.Settings.MaxSlots},
{"world", (TShock.Config.Settings.UseServerName ? TShock.Config.Settings.ServerName : Main.worldName)}, {"world", (TShock.Config.Settings.UseServerName ? TShock.Config.Settings.ServerName : Main.worldName)},
{"uptime", (DateTime.Now - System.Diagnostics.Process.GetCurrentProcess().StartTime).ToString(@"d'.'hh':'mm':'ss")}, {"uptime", (DateTime.Now - System.Diagnostics.Process.GetCurrentProcess().StartTime).ToString(@"d'.'hh':'mm':'ss")},
@ -944,8 +944,8 @@ namespace TShockAPI
[Token] [Token]
private object PlayerList(RestRequestArgs args) private object PlayerList(RestRequestArgs args)
{ {
var activeplayers = Main.player.Where(p => null != p && p.active).ToList(); var activeplayers = TShock.Players.Where(p => null != p && p.Active).Select(p => p.Name);
return new RestObject() { { "players", string.Join(", ", activeplayers.Select(p => p.name)) } }; return new RestObject() { { "players", string.Join(", ", activeplayers) } };
} }
[Description("Fetches detailed user information on all connected users, and can be filtered by specifying a key value pair filter users where the key is a field and the value is a users field value.")] [Description("Fetches detailed user information on all connected users, and can be filtered by specifying a key value pair filter users where the key is a field and the value is a users field value.")]

4
TShockAPI/Utils.cs
View file

@ -172,7 +172,7 @@ namespace TShockAPI
foreach (TSPlayer player in TShock.Players) foreach (TSPlayer player in TShock.Players)
{ {
if (player != null && player != excludedPlayer && player.Active && player.HasPermission(Permissions.logs) && if (player != null && player != excludedPlayer && player.Active && player.HasPermission(Permissions.logs) &&
player.DisplayLogs && TShock.Config.Settings.DisableSpewLogs == false) player.DisplayLogs && !TShock.Config.Settings.DisableSpewLogs)
player.SendMessage(log, color); player.SendMessage(log, color);
} }
} }
@ -183,7 +183,7 @@ namespace TShockAPI
/// <returns>The number of active players on the server.</returns> /// <returns>The number of active players on the server.</returns>
public int GetActivePlayerCount() public int GetActivePlayerCount()
{ {
return Main.player.Where(p => null != p && p.active).Count(); return TShock.Players.Count(p => null != p && p.Active);
} }
//Random should not be generated in a method //Random should not be generated in a method