Merge upstream to 1.7.0a

This commit is contained in:
Sachin 2024-12-23 18:55:29 +05:30
commit 48b4b40dbb
10 changed files with 108 additions and 22 deletions

View file

@ -286,7 +286,7 @@ public class PermissionManager(Database.Database? database)
// Console.WriteLine($"Player SteamID: {player.PlayerSteamId}, Name: {player.PlayerName}, Flags: {string.Join(", ", player.Flags)}, Immunity: {player.Immunity}, Ends: {player.Ends}");
// }
List<(string, string, List<string>, int, DateTime?)> filteredFlagsWithImmunity = [];
List<(string, string, List<string>, int, DateTime?)> filteredFlagsWithImmunity = [];
// Add the grouped players to the list
filteredFlagsWithImmunity.AddRange(groupedPlayers);

View file

@ -27,7 +27,7 @@ public class ServerManager
{
ipAddress = Helper.GetServerIp();
if (_getIpTryCount <= 32)
if (_getIpTryCount <= 32 && (string.IsNullOrEmpty(ipAddress) || ipAddress.StartsWith("0.0.0")))
{
_getIpTryCount++;