diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 33a138a..7d74aac 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -4238,13 +4238,17 @@ void Player::RemoveArenaSpellCooldowns(bool removeActivePetCooldowns) for (itr = m_spellCooldowns.begin(); itr != m_spellCooldowns.end(); itr = next) { next = itr; ++next; SpellInfo const* entry = sSpellMgr->GetSpellInfo(itr->first); + + if(!entry) continue; + if(entry->Id == 33060) continue; //mr pinchy + if(entry->Id == 26265) continue; //create elune stone + // check if spellentry is present and if the cooldown is less or equal to 10 min - if (entry && - entry->RecoveryTime <= 10 * MINUTE * IN_MILLISECONDS && + if (entry->RecoveryTime <= 10 * MINUTE * IN_MILLISECONDS && entry->CategoryRecoveryTime <= 10 * MINUTE * IN_MILLISECONDS) { // remove & notify RemoveSpellCooldown(itr->first, true); }