From e584316a2889a89f29ed7b81cd110d3de9aeb6a9 Mon Sep 17 00:00:00 2001
From: Dawid Bepierszcz <41084667+daffyyyy@users.noreply.github.com>
Date: Thu, 25 Jan 2024 21:09:24 +0100
Subject: [PATCH] 1.2.8b

- Changing connect event, in previous sometimes player == null
---
 CS2-SimpleAdmin.cs | 2 +-
 Events.cs          | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CS2-SimpleAdmin.cs b/CS2-SimpleAdmin.cs
index be32f0f..a4ba2d3 100644
--- a/CS2-SimpleAdmin.cs
+++ b/CS2-SimpleAdmin.cs
@@ -36,7 +36,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
 	public override string ModuleName => "CS2-SimpleAdmin";
 	public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
 	public override string ModuleAuthor => "daffyy";
-	public override string ModuleVersion => "1.2.8a";
+	public override string ModuleVersion => "1.2.8b";
 
 	public CS2_SimpleAdminConfig Config { get; set; } = new();
 
diff --git a/Events.cs b/Events.cs
index 23bf8a6..053b92d 100644
--- a/Events.cs
+++ b/Events.cs
@@ -16,7 +16,8 @@ public partial class CS2_SimpleAdmin
 	private void registerEvents()
 	{
 		//RegisterListener<OnClientAuthorized>(OnClientAuthorized);
-		RegisterListener<OnClientConnect>(OnClientConnect);
+		//RegisterListener<OnClientConnect>(OnClientConnect);
+		RegisterListener<OnClientPutInServer>(OnClientPutInServer);
 		//RegisterEventHandler<EventPlayerConnectFull>(OnPlayerFullConnect);
 		RegisterListener<OnClientDisconnect>(OnClientDisconnect);
 		RegisterListener<OnMapStart>(OnMapStart);
@@ -125,14 +126,14 @@ public partial class CS2_SimpleAdmin
 		return HookResult.Continue;
 	}
 
-	private void OnClientConnect(int playerSlot, string name, string ipAddress)
+	private void OnClientPutInServer(int playerSlot)
 	{
 		CCSPlayerController? player = Utilities.GetPlayerFromSlot(playerSlot);
 
 		if (player == null || !player.IsValid || player.IsBot || player.IsHLTV)
 			return;
 
-		ipAddress = ipAddress.Split(":")[0];
+		string? ipAddress = !string.IsNullOrEmpty(player.IpAddress) ? player.IpAddress.Split(":")[0] : null;
 
 		if (
 			ipAddress != null && bannedPlayers.Contains(ipAddress) ||