source/player/player.cpp

@@ -846,6 +846,16 @@ if(newmode!=-1)
 				{
 					// If already armed then drop current weapon
 					if(m_currentMode!=PLAYER_MODE_BASICUNARMED)
+					{
+						switch(m_currentPlayerModeClass->getState())
+						{
+							case STATE_BUTTBOUNCE:
+							case STATE_BUTTFALL:
+							case STATE_BUTTLAND:
+							case STATE_BUTTBOUNCEUP:
+								break;
+
+							default:
 								{
 									static const int	s_pickupsToDrop[NUM_PLAYERMODES]=
 									{
@@ -875,6 +885,10 @@ if(newmode!=-1)
 										((CBaseWeaponPickup*)pickup)->setHasBeenCollected();
 									}
 									setMode(PLAYER_MODE_BASICUNARMED);
+
+									break;
+								}
+						}
 					}
 
 					// Now trying to pick up a weapon..