small fixes

Author: Bitl

game/quiver/info_changelog.txt

@@ -9,6 +9,9 @@ Details:
 - Fixed zoomed-in viewmodels flipping upside down at higher FOVs.
 - Fixed env_sun sprite disappearing when you look at it.
 - Fixed issues with the inventory system.
+- Updated items_game to reflect the latest TF2 update.
+- Added the following Source SDK Pull Requests:
+	- #1466: MAX_MENU_STRING increase (increased to 4096 characters)
 
 Quiver Private Alpha 1.1.0:
 Whitelists:

src/game/server/tf/tf_player.cpp

@@ -9454,7 +9454,10 @@ END_DATADESC()
 
 void CTFPlayer::BreakArmor(const CTakeDamageInfo& info, CTFPlayer* pTFAttacker, int bitsDamage, bool bNoArmor)
 {
-	if (m_Shared.IsInvulnerable() || DoesDamagePenetrateArmor(info, bitsDamage))
+	if (m_Shared.IsInvulnerable())
+		return;
+
+	if (DoesDamagePenetrateArmor(info, bitsDamage))
 		return;
 
 	if (!bNoArmor)
@@ -12801,8 +12804,9 @@ void CTFPlayer::Event_Killed( const CTakeDamageInfo &info )
 
 #if defined(QUIVER_DLL)
 	// if we died, and we have armor, break the armor so our shield goes away.
-	// if the damage penetrates or we somehow died while in uber, we set the armor value to 0 silently.
-	if (!m_Shared.IsInvulnerable() && !DoesDamagePenetrateArmor(info, info.GetDamageType()))
+	// if the damage penetrates, we set the armor value to 0 silently.
+	if (!DoesDamagePenetrateArmor(info, info.GetDamageType()))
+	
 	{
 		if (ArmorValue() > 0)
 		{