diff --git a/src/game/shared/hl2mp/weapon_physcannon.cpp b/src/game/shared/hl2mp/weapon_physcannon.cpp index 26fdfefdb..fc3e23ece 100644 --- a/src/game/shared/hl2mp/weapon_physcannon.cpp +++ b/src/game/shared/hl2mp/weapon_physcannon.cpp @@ -792,6 +792,13 @@ void CPlayerPickupController::Use( CBaseEntity *pActivator, CBaseEntity *pCaller //Adrian: Oops, our object became motion disabled, let go! IPhysicsObject *pPhys = pAttached->VPhysicsGetObject(); + + if ( !pPhys ) + { + Shutdown(); + return; + } + if ( pPhys && pPhys->IsMoveable() == false ) { Shutdown(); @@ -808,7 +815,7 @@ void CPlayerPickupController::Use( CBaseEntity *pActivator, CBaseEntity *pCaller } #endif // +ATTACK will throw phys objects - if ( m_pPlayer->m_nButtons & IN_ATTACK ) + if ( pPhys && m_pPlayer->m_nButtons & IN_ATTACK ) { Shutdown( true ); Vector vecLaunch;