fix: Random errors on client disconnect

K4ryuu · Nov 24, 2023 · 665a0df · 665a0df
1 parent 2a05273
commit 665a0df
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -8,6 +8,7 @@
 - fix: 161 Segmentation fault
 - fix: Time updates on !time command
 - fix: Alive time not saved properly
+- fix: Random errors on client disconnect
 
 - -- 2023.10.21 - V1.3.3
 

diff --git a/src/Events.cs b/src/Events.cs
@@ -196,6 +196,9 @@ private void SetupGameEvents()
 			});
 			RegisterEventHandler<EventPlayerTeam>((@event, info) =>
 			{
+				if ((CsTeam)@event.Team == CsTeam.None)
+					return HookResult.Continue;
+
 				if (!Config.GeneralSettings.ModuleTimes)
 				{
 					Log("EventPlayerTeam: ModuleTimes is not enabled.", LogLevel.Debug);
@@ -424,7 +427,7 @@ private void SetupGameEvents()
 				CCSPlayerController killerController = @event.Attacker;
 				CCSPlayerController assisterController = @event.Assister;
 
-				if (!victimController.IsValid)
+				if (victimController == null || !victimController.IsValid || victimController.UserId <= 0)
 					return HookResult.Continue;
 
 				if (!victimController.IsBot)