diff --git a/src/game/server/hl2/prop_combine_ball.cpp b/src/game/server/hl2/prop_combine_ball.cpp index b93703498..5ca7dad0c 100644 --- a/src/game/server/hl2/prop_combine_ball.cpp +++ b/src/game/server/hl2/prop_combine_ball.cpp @@ -769,6 +769,12 @@ void CPropCombineBall::SetBallAsLaunched( void ) WhizSoundThink(); } +bool CPropCombineBall::OnAttemptPhysGunPickup( CBasePlayer *pPhysGunUser, PhysGunPickup_t reason ) +{ + return ( !m_bHeld || pPhysGunUser == GetOwnerEntity() ? + CDefaultPlayerPickupVPhysics::OnAttemptPhysGunPickup( pPhysGunUser, reason ) : false ); +} + //----------------------------------------------------------------------------- // Lighten the mass so it's zippy toget to the gun //----------------------------------------------------------------------------- diff --git a/src/game/server/hl2/prop_combine_ball.h b/src/game/server/hl2/prop_combine_ball.h index 1de4390da..272235caf 100644 --- a/src/game/server/hl2/prop_combine_ball.h +++ b/src/game/server/hl2/prop_combine_ball.h @@ -117,6 +117,7 @@ public: private: + bool OnAttemptPhysGunPickup( CBasePlayer *, PhysGunPickup_t ) OVERRIDE; void SetPlayerLaunched( CBasePlayer *pOwner ); float GetBallHoldDissolveTime();