Merge pull request #998 from Kitsune44/hotfix

BenLubar · web-flow · commit ddf4185ffaf3 · 2025-11-06T05:37:03.000-06:00
Hotfix: OnHitConfirm
diff --git a/src/game/server/swarm/asw_barrel_explosive.cpp b/src/game/server/swarm/asw_barrel_explosive.cpp
@@ -143,7 +143,7 @@ void CASW_Barrel_Explosive::DoExplosion()
 		vecForward = Vector( 0, 0, -1 );
 	VectorNormalize( vecForward );
 	trace_t tr;
-	UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
+	UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );
 
 	if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
 	{
diff --git a/src/game/server/swarm/asw_firewall_piece.cpp b/src/game/server/swarm/asw_firewall_piece.cpp
@@ -103,7 +103,7 @@ void CASW_Firewall_Piece::Spawn( void )
 
 		// scorch decals
 		trace_t tr2;
-		UTIL_TraceLine( tr.endpos + Vector( 0.0f, 0.0f, 32.0f ), tr.endpos + Vector( 0.0f, 0.0f, -60.0f ), MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, ASW_COLLISION_GROUP_IGNORE_NPCS, &tr2 );
+		UTIL_TraceLine( tr.endpos + Vector( 0.0f, 0.0f, 32.0f ), tr.endpos + Vector( 0.0f, 0.0f, -80.0f ), MASK_SHOT_HULL, this, ASW_COLLISION_GROUP_IGNORE_NPCS, &tr2 );
 		UTIL_DecalTrace( &tr2, "Scorch" );
 	}
 }
diff --git a/src/game/server/swarm/asw_grenade_cluster.cpp b/src/game/server/swarm/asw_grenade_cluster.cpp
@@ -262,12 +262,12 @@ void CASW_Grenade_Cluster::DoExplosion()
 	//if (m_bMaster)
 	{
 		Vector vecForward = GetAbsVelocity();
-        float flTraceDist = 60.0f;
+        float flTraceDist = 80.0f;
 		if ( vecForward.LengthSqr() < 0.001f )
 			vecForward = Vector( 0, 0, -1 );
 		VectorNormalize( vecForward );
 		trace_t tr;
-		UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
+		UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );
 
 		if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
 		{
diff --git a/src/game/server/swarm/asw_grenade_vindicator.cpp b/src/game/server/swarm/asw_grenade_vindicator.cpp
@@ -261,12 +261,12 @@ void CASW_Grenade_Vindicator::Detonate()
 	if (m_bMaster)
 	{
 		Vector vecForward = GetAbsVelocity();
-		float flTraceDist = 60.0f;
+		float flTraceDist = 80.0f;
 		if ( vecForward.LengthSqr() < 0.001f )
 			vecForward = Vector( 0, 0, -1 );
 		VectorNormalize( vecForward );
 		trace_t tr;
-		UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
+		UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );
 
 		if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
 		{
diff --git a/src/game/server/swarm/asw_laser_mine.cpp b/src/game/server/swarm/asw_laser_mine.cpp
@@ -235,7 +235,7 @@ void CASW_Laser_Mine::Explode( bool bRemove )
 {
     // scorch decal
 	trace_t tr;
-	UTIL_TraceLine( GetAbsOrigin() + m_vecSurfaceNormal * 32.0f, GetAbsOrigin() - m_vecSurfaceNormal * 80.0f, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );
+	UTIL_TraceLine( GetAbsOrigin() + m_vecSurfaceNormal * 32.0f, GetAbsOrigin() - m_vecSurfaceNormal * 80.0f, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );
 
 	if ( ( tr.m_pEnt != GetWorldEntity() ) || ( tr.hitbox != 0 ) )
 	{
diff --git a/src/game/shared/swarm/asw_alien_shared.cpp b/src/game/shared/swarm/asw_alien_shared.cpp
@@ -158,7 +158,7 @@ void CASW_Alien::DoBloodDecal( float flDamage, const Vector &vecPos, const Vecto
 		vecTraceDir.z += random->RandomFloat( -flNoise, flNoise );
 
 		// Don't bleed on grates.
-		UTIL_TraceLine( vecPos, vecPos + vecTraceDir * -flTraceDist, MASK_SHOT_HULL | CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &Bloodtr);
+		UTIL_TraceLine( vecPos, vecPos + vecTraceDir * -flTraceDist, MASK_SHOT_HULL & ~CONTENTS_GRATE, this, COLLISION_GROUP_NONE, &Bloodtr);
 
 		if ( Bloodtr.fraction != 1.0 )
 		{
diff --git a/src/game/shared/swarm/rd_inventory_shared.cpp b/src/game/shared/swarm/rd_inventory_shared.cpp
@@ -3808,7 +3808,7 @@ namespace ReactiveDropInventory
 			if ( bKilled && pTarget && pTarget->IsInhabitableNPC() )
 				s_RD_Inventory_Manager.IncrementStrangePropertyOnEquippedItems( assert_cast<CASW_Inhabitable_NPC*>( pTarget ), 5007, 0, 0, false );
 
-			if ( !pAttacker && !pTarget )
+			if ( !pAttacker || !pTarget )
 				return;
 			
 			if ( bKilled && pWeapon

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ void CASW_Barrel_Explosive::DoExplosion()`
`143`	`143`	`vecForward = Vector( 0, 0, -1 );`
`144`	`144`	`VectorNormalize( vecForward );`
`145`	`145`	`trace_t tr;`
`146`		`- UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL \| CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );`
	`146`	`+ UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );`
`147`	`147`
`148`	`148`	`if ( ( tr.m_pEnt != GetWorldEntity() ) \|\| ( tr.hitbox != 0 ) )`
`149`	`149`	`{`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ void CASW_Firewall_Piece::Spawn( void )`
`103`	`103`
`104`	`104`	`// scorch decals`
`105`	`105`	`trace_t tr2;`
`106`		`- UTIL_TraceLine( tr.endpos + Vector( 0.0f, 0.0f, 32.0f ), tr.endpos + Vector( 0.0f, 0.0f, -60.0f ), MASK_SHOT_HULL \| CONTENTS_TRANSLUCENT, this, ASW_COLLISION_GROUP_IGNORE_NPCS, &tr2 );`
	`106`	`+ UTIL_TraceLine( tr.endpos + Vector( 0.0f, 0.0f, 32.0f ), tr.endpos + Vector( 0.0f, 0.0f, -80.0f ), MASK_SHOT_HULL, this, ASW_COLLISION_GROUP_IGNORE_NPCS, &tr2 );`
`107`	`107`	`UTIL_DecalTrace( &tr2, "Scorch" );`
`108`	`108`	`}`
`109`	`109`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,12 +262,12 @@ void CASW_Grenade_Cluster::DoExplosion()`
`262`	`262`	`//if (m_bMaster)`
`263`	`263`	`{`
`264`	`264`	`Vector vecForward = GetAbsVelocity();`
`265`		`- float flTraceDist = 60.0f;`
	`265`	`+ float flTraceDist = 80.0f;`
`266`	`266`	`if ( vecForward.LengthSqr() < 0.001f )`
`267`	`267`	`vecForward = Vector( 0, 0, -1 );`
`268`	`268`	`VectorNormalize( vecForward );`
`269`	`269`	`trace_t tr;`
`270`		`- UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL \| CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );`
	`270`	`+ UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );`
`271`	`271`
`272`	`272`	`if ( ( tr.m_pEnt != GetWorldEntity() ) \|\| ( tr.hitbox != 0 ) )`
`273`	`273`	`{`
Original file line number	Diff line number	Diff line change
`@@ -261,12 +261,12 @@ void CASW_Grenade_Vindicator::Detonate()`
`261`	`261`	`if (m_bMaster)`
`262`	`262`	`{`
`263`	`263`	`Vector vecForward = GetAbsVelocity();`
`264`		`- float flTraceDist = 60.0f;`
	`264`	`+ float flTraceDist = 80.0f;`
`265`	`265`	`if ( vecForward.LengthSqr() < 0.001f )`
`266`	`266`	`vecForward = Vector( 0, 0, -1 );`
`267`	`267`	`VectorNormalize( vecForward );`
`268`	`268`	`trace_t tr;`
`269`		`- UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL \| CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );`
	`269`	`+ UTIL_TraceLine( GetAbsOrigin(), GetAbsOrigin() + flTraceDist * vecForward, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );`
`270`	`270`
`271`	`271`	`if ( ( tr.m_pEnt != GetWorldEntity() ) \|\| ( tr.hitbox != 0 ) )`
`272`	`272`	`{`
Original file line number	Diff line number	Diff line change
`@@ -235,7 +235,7 @@ void CASW_Laser_Mine::Explode( bool bRemove )`
`235`	`235`	`{`
`236`	`236`	`// scorch decal`
`237`	`237`	`trace_t tr;`
`238`		`- UTIL_TraceLine( GetAbsOrigin() + m_vecSurfaceNormal * 32.0f, GetAbsOrigin() - m_vecSurfaceNormal * 80.0f, MASK_SHOT_HULL \| CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &tr );`
	`238`	`+ UTIL_TraceLine( GetAbsOrigin() + m_vecSurfaceNormal * 32.0f, GetAbsOrigin() - m_vecSurfaceNormal * 80.0f, MASK_SHOT_HULL, this, COLLISION_GROUP_NONE, &tr );`
`239`	`239`
`240`	`240`	`if ( ( tr.m_pEnt != GetWorldEntity() ) \|\| ( tr.hitbox != 0 ) )`
`241`	`241`	`{`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ void CASW_Alien::DoBloodDecal( float flDamage, const Vector &vecPos, const Vecto`
`158`	`158`	`vecTraceDir.z += random->RandomFloat( -flNoise, flNoise );`
`159`	`159`
`160`	`160`	`// Don't bleed on grates.`
`161`		`- UTIL_TraceLine( vecPos, vecPos + vecTraceDir * -flTraceDist, MASK_SHOT_HULL \| CONTENTS_TRANSLUCENT, this, COLLISION_GROUP_NONE, &Bloodtr);`
	`161`	`+ UTIL_TraceLine( vecPos, vecPos + vecTraceDir * -flTraceDist, MASK_SHOT_HULL & ~CONTENTS_GRATE, this, COLLISION_GROUP_NONE, &Bloodtr);`
`162`	`162`
`163`	`163`	`if ( Bloodtr.fraction != 1.0 )`
`164`	`164`	`{`