Only players touch nihilanth portals

Mikk155 · Sep 24, 2024 · a0ce712 · a0ce712
1 parent b2d79c2
commit a0ce712
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/game/server/entities/NPCs/aliens/nihilanth.cpp b/src/game/server/entities/NPCs/aliens/nihilanth.cpp
@@ -1653,14 +1653,19 @@ void CNihilanthHVR::TeleportTouch(CBaseEntity* pOther)
 {
 	CBaseEntity* pEnemy = m_hEnemy;
 
-	if (pOther == pEnemy)
+	if( auto player = ToBasePlayer( pOther ); pOther != nullptr )
 	{
 		if (m_hTargetEnt != nullptr)
 			m_hTargetEnt->Use(pEnemy, pEnemy, USE_ON, 1.0);
 
 		if (m_hTouch != nullptr && pEnemy != nullptr)
 			m_hTouch->Touch(pEnemy);
 	}
+	else if( pOther != nullptr && !pOther->ClassNameIs( "worldspawn" ) && !pOther->IsBSPModel() )
+	{
+		UTIL_Remove( pOther );
+		return;
+	}
 	else
 	{
 		m_pNihilanth->MakeFriend(pev->origin);