Skip to content

Commit 5e971b0

Browse files
committed
last fix for the night
1 parent 3f1602f commit 5e971b0

File tree

2 files changed

+17
-1
lines changed

2 files changed

+17
-1
lines changed

game/quiver/info_changelog.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Details:
8888
- The Sandman's ball now breaks armor.
8989
- Set the Sniper's ammo count back from 16 to 25.
9090
- The Family Business is now a multi-class shotgun.
91-
- Added a Vaccinator shield to symbolize armor, but it doesn't flash on hit.
91+
- Added a Vaccinator shield to visualize armor, but it doesn't flash on hit.
9292
- Added the following Source SDK Pull Requests:
9393
- #1437: MvM: Fix Explosive Headshot working on invulnerable target
9494
- #1440: Treat being in background map as not in-game

src/game/server/tf/tf_player.cpp

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12791,6 +12791,22 @@ void CTFPlayer::Event_Killed( const CTakeDamageInfo &info )
1279112791
return;
1279212792
}
1279312793

12794+
#if defined(QUIVER_DLL)
12795+
// if we died, and we have armor, break the armor so our shield goes away.
12796+
// if the damage penetrates or we somehow died while in uber, we set the armor value to 0 silently.
12797+
if (!m_Shared.IsInvulnerable() && !DoesDamagePenetrateArmor(info, info.GetDamageType()))
12798+
{
12799+
if (ArmorValue() > 0)
12800+
{
12801+
BreakArmor(info, pPlayerAttacker, info.GetDamageType(), false);
12802+
}
12803+
}
12804+
else
12805+
{
12806+
SetArmorValue(0);
12807+
}
12808+
#endif
12809+
1279412810
SpeakConceptIfAllowed( MP_CONCEPT_DIED );
1279512811

1279612812
StateTransition( TF_STATE_DYING ); // Transition into the dying state.

0 commit comments

Comments
 (0)