diff --git a/src/server/game/Entities/Player/PlayerUpdates.cpp b/src/server/game/Entities/Player/PlayerUpdates.cpp index 162b10d48..8c33e67ba 100644 --- a/src/server/game/Entities/Player/PlayerUpdates.cpp +++ b/src/server/game/Entities/Player/PlayerUpdates.cpp @@ -2333,6 +2333,12 @@ void Player::ProcessSpellQueue() { PendingSpellCastRequest& request = SpellQueue.front(); // Peek at the first spell SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(request.spellId); + if (!spellInfo) + { + LOG_ERROR("entities.player", "Player::ProcessSpellQueue: Invalid spell {}", request.spellId); + SpellQueue.clear(); + break; + } if (CanExecutePendingSpellCastRequest(spellInfo)) { ExecuteOrCancelSpellCastRequest(&request);