Fixed possible crash

XutaxKamay · Sep 14, 2024 · db03935 · db03935
1 parent 3291b70
commit db03935
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/game/server/cstrike/bot/cs_bot_manager.cpp b/game/server/cstrike/bot/cs_bot_manager.cpp
@@ -1942,7 +1942,16 @@ class CheckAreasOverlappingBreakable
 //--------------------------------------------------------------------------------------------------------------
 void CCSBotManager::OnBreakBreakable( IGameEvent *event )
 {
-	CheckAreasOverlappingBreakable collector( UTIL_EntityByIndex( event->GetInt( "entindex" ) ) );
+	auto ent = UTIL_EntityByIndex( event->GetInt( "entindex" ) );
+
+	if ( !ent )
+	{
+		// TODO_ENHANCED.
+		DevMsg("CCSBotManager::OnBreakBreakable bug\n");
+		return;
+	}
+
+	CheckAreasOverlappingBreakable collector( ent );
 	TheNavMesh->ForAllAreas( collector );
 
 	CCSBOTMANAGER_ITERATE_BOTS( OnBreakBreakable, event );
@@ -1952,7 +1961,16 @@ void CCSBotManager::OnBreakBreakable( IGameEvent *event )
 //--------------------------------------------------------------------------------------------------------------
 void CCSBotManager::OnBreakProp( IGameEvent *event )
 {
-	CheckAreasOverlappingBreakable collector( UTIL_EntityByIndex( event->GetInt( "entindex" ) ) );
+	auto ent = UTIL_EntityByIndex( event->GetInt( "entindex" ) );
+
+	if ( !ent )
+	{
+		// TODO_ENHANCED.
+		DevMsg("CCSBotManager::OnBreakProp bug\n");
+		return;
+	}
+
+	CheckAreasOverlappingBreakable collector( ent );
 	TheNavMesh->ForAllAreas( collector );
 
 	CCSBOTMANAGER_ITERATE_BOTS( OnBreakProp, event );