diff options
9 files changed, 13 insertions, 7 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index 5b61c876038..c324ec80c3c 100644 --- a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp +++ b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp @@ -1202,7 +1202,7 @@ void BattlefieldWG::BrokenWallOrTower(TeamId team, BfWGGameObjectBuilding* build for (auto itr = m_PlayersInWar[GetAttackerTeam()].begin(); itr != m_PlayersInWar[GetAttackerTeam()].end(); ++itr) { if (Player* player = ObjectAccessor::FindPlayer(*itr)) - if (player->GetDistance2d(GetGameObject(building->GetGUID())) < 50.0f) + if (player->GetDistance2d(ASSERT_NOTNULL(GetGameObject(building->GetGUID()))) < 50.0f) player->KilledMonsterCredit(QUEST_CREDIT_DEFEND_SIEGE); } } diff --git a/src/server/game/Cache/CharacterCache.cpp b/src/server/game/Cache/CharacterCache.cpp index a078c502e40..aea05434410 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -183,6 +183,7 @@ void CharacterCache::UpdateCharacterArenaTeamId(ObjectGuid const& guid, uint8 sl if (itr == _characterCacheStore.end()) return; + ASSERT(slot < 3); itr->second.ArenaTeamId[slot] = arenaTeamId; } @@ -295,7 +296,9 @@ uint32 CharacterCache::GetCharacterArenaTeamIdByGuid(ObjectGuid guid, uint8 type if (itr == _characterCacheStore.end()) return 0; - return itr->second.ArenaTeamId[ArenaTeam::GetSlotByType(type)]; + uint8 slot = ArenaTeam::GetSlotByType(type); + ASSERT(slot < 3); + return itr->second.ArenaTeamId[slot]; } bool CharacterCache::GetCharacterNameAndClassByGUID(ObjectGuid guid, std::string& name, uint8& _class) const diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 317c4ecd82d..fbd6f7e2d6d 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17581,6 +17581,7 @@ void Player::_LoadArenaTeamInfo(PreparedQueryResult result) } uint8 arenaSlot = arenaTeam->GetSlot(); + ASSERT(arenaSlot < 3); personalRatingCache[arenaSlot] = fields[4].GetUInt16(); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9b7dfeb8548..ebb7d809331 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -11625,7 +11625,7 @@ void Unit::HandleSpellClick(Unit* clicker, int8 seatId /*= -1*/) Unit* target = (clickPair.second.castFlags & NPC_CLICK_CAST_TARGET_CLICKER) ? clicker : this; ObjectGuid origCasterGUID = (clickPair.second.castFlags & NPC_CLICK_CAST_ORIG_CASTER_OWNER) ? GetOwnerGUID() : clicker->GetGUID(); - SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(clickPair.second.spellId, caster->GetMap()->GetDifficultyID()); + SpellInfo const* spellEntry = sSpellMgr->AssertSpellInfo(clickPair.second.spellId, caster->GetMap()->GetDifficultyID()); // if (!spellEntry) should be checked at npc_spellclick load if (seatId > -1) diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index e33df89c18a..8036b054225 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5890,7 +5890,7 @@ void ObjectMgr::ValidateSpellScripts() for (auto& spell : _spellScriptsStore) { - SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(spell.first, DIFFICULTY_NONE); + SpellInfo const* spellEntry = sSpellMgr->AssertSpellInfo(spell.first, DIFFICULTY_NONE); if (SpellScriptLoader* spellScriptLoader = sScriptMgr->GetSpellScriptLoader(spell.second.first)) { diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 0386173a7ce..6ee5aaf7ae2 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -948,6 +948,8 @@ Item* Guild::BankMoveItemData::StoreItem(CharacterDatabaseTransaction& trans, It ItemPosCount pos(*itr); ++itr; + ASSERT(pItem); + TC_LOG_DEBUG("guild", "GUILD STORAGE: StoreItem tab = %u, slot = %u, item = %u, count = %u", m_container, m_slotId, pItem->GetEntry(), pItem->GetCount()); pLastItem = _StoreItem(trans, pTab, pItem, pos, itr != m_vec.end()); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index 7cda95b5661..171d9c885f1 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1140,7 +1140,7 @@ struct npc_sergeant_morigan : public CreatureScript struct npc_sergeant_moriganAI : public NullCreatureAI { - npc_sergeant_moriganAI(Creature* creature) : NullCreatureAI(creature), Started(false) { } + npc_sergeant_moriganAI(Creature* creature) : NullCreatureAI(creature), Started(false), Question(0) { } void InitializeAI() override { diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp index 77ddd9b8ec4..19a75c6fc99 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp @@ -1640,7 +1640,7 @@ struct npc_stratholme_rp_dummy : NullCreatureAI { if (type == POINT_MOTION_TYPE || type == EFFECT_MOTION_TYPE || type == SPLINE_CHAIN_MOTION_TYPE) if (TempSummon* self = me->ToTempSummon()) - self->GetSummonerCreatureBase()->AI()->MovementInform(type, id); + ASSERT_NOTNULL(self->GetSummonerCreatureBase())->AI()->MovementInform(type, id); } }; diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp index eff9c455cd0..4d9c3279761 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -769,7 +769,7 @@ class boss_thorim : public CreatureScript for (auto itr = triggers.cbegin(); itr != triggers.cend();) { auto prev = itr++; - if (itr != triggers.end()) + if (itr != triggers.cend()) (*prev)->CastSpell(*itr, SPELL_LIGHTNING_BEAM_CHANNEL); } break; |