aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2021-10-16 13:28:19 +0200
committerShauren <shauren.trinity@gmail.com>2021-10-16 13:28:19 +0200
commit145a75dea6529f07d2875952658b59b34024251a (patch)
tree8da1e2768a2ff6d31b8c2fce12c0ef8c657ac46b /src
parent6b69338990a651c54dd9d2b5ad3281a4d702efb7 (diff)
Core/Items: Replace assert with null check in Player::ApplyEquipCooldown
Closes #27069
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Player/Player.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
index 8bc1b8bf386..61d463ed7e0 100644
--- a/src/server/game/Entities/Player/Player.cpp
+++ b/src/server/game/Entities/Player/Player.cpp
@@ -24413,7 +24413,10 @@ void Player::ApplyEquipCooldown(Item* pItem)
std::chrono::steady_clock::time_point now = GameTime::GetGameTimeSteadyPoint();
for (ItemEffectEntry const* effectData : pItem->GetEffects())
{
- SpellInfo const* effectSpellInfo = sSpellMgr->AssertSpellInfo(effectData->SpellID, DIFFICULTY_NONE);
+ SpellInfo const* effectSpellInfo = sSpellMgr->GetSpellInfo(effectData->SpellID, DIFFICULTY_NONE);
+ if (!effectSpellInfo)
+ continue;
+
// apply proc cooldown to equip auras if we have any
if (effectData->TriggerType == ITEM_SPELLTRIGGER_ON_EQUIP)
{