Skip to content

[TF2] Fix being able to pick up tier 1 magic spells without a spellbook equipped. #1583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Fix being able to pick up tier 1 magic spells without a spellbook equipped. #1583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/game/server/tf/halloween/spell/tf_spell_pickup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ bool CSpellPickup::ItemCanBeTouchedByPlayer( CBasePlayer *pPlayer )
if ( IsDisabled() )
return false;

// Dont let them pick up new spells if they already have a spell unless its a tier 1 spell
CTFPlayer *pTFPlayer = ToTFPlayer( pPlayer );
if ( pTFPlayer && m_nTier == 0 )
if ( pTFPlayer )
{
// Check for spellbook regardless of tier
CTFSpellBook *pSpellBook = dynamic_cast< CTFSpellBook* >( pTFPlayer->GetEntityForLoadoutSlot( LOADOUT_POSITION_ACTION ) );
if ( !pSpellBook )
{
Expand All @@ -81,7 +81,8 @@ bool CSpellPickup::ItemCanBeTouchedByPlayer( CBasePlayer *pPlayer )
return false;
}

if ( pSpellBook->HasASpellWithCharges() )
// Only check for existing charges on tier 0 spells
if ( m_nTier == 0 && pSpellBook->HasASpellWithCharges() )
{
return false;
}
Expand Down