diff options
Diffstat (limited to 'src')
10 files changed, 14 insertions, 8 deletions
diff --git a/src/server/game/Battlefield/Zones/BattlefieldWG.cpp b/src/server/game/Battlefield/Zones/BattlefieldWG.cpp index d785b043cf1..aa4f2a181e6 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 c8582702909..4122fb50cf2 100644 --- a/src/server/game/Cache/CharacterCache.cpp +++ b/src/server/game/Cache/CharacterCache.cpp @@ -172,6 +172,7 @@ void CharacterCache::UpdateCharacterArenaTeamId(ObjectGuid const& guid, uint8 sl if (itr == _characterCacheStore.end()) return; + ASSERT(slot < 3); itr->second.ArenaTeamId[slot] = arenaTeamId; } @@ -271,5 +272,7 @@ 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]; } diff --git a/src/server/game/Conditions/ConditionMgr.cpp b/src/server/game/Conditions/ConditionMgr.cpp index 122cd65a173..ee4feff9d61 100644 --- a/src/server/game/Conditions/ConditionMgr.cpp +++ b/src/server/game/Conditions/ConditionMgr.cpp @@ -505,7 +505,7 @@ bool Condition::Meets(ConditionSourceInfo& sourceInfo) const { if (Player* player = object->ToPlayer()) { - const Quest* quest = sObjectMgr->GetQuestTemplate(ConditionValue1); + const Quest* quest = ASSERT_NOTNULL(sObjectMgr->GetQuestTemplate(ConditionValue1)); uint16 log_slot = player->FindQuestSlot(quest->GetQuestId()); if (log_slot >= MAX_QUEST_LOG_SIZE) break; diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index e723c2d993b..4827b11df62 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -16929,6 +16929,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 8cecb48cd57..22bddb2457b 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -12383,7 +12383,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); + SpellInfo const* spellEntry = sSpellMgr->AssertSpellInfo(clickPair.second.spellId); // 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 850d75d649d..ab847c2b1c8 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -5711,7 +5711,7 @@ void ObjectMgr::ValidateSpellScripts() for (auto spell : _spellScriptsStore) { - SpellInfo const* spellEntry = sSpellMgr->GetSpellInfo(spell.first); + SpellInfo const* spellEntry = sSpellMgr->AssertSpellInfo(spell.first); auto const bounds = sObjectMgr->GetSpellScriptsBounds(spell.first); diff --git a/src/server/game/Guilds/Guild.cpp b/src/server/game/Guilds/Guild.cpp index 0427097f30b..d6d91467795 100644 --- a/src/server/game/Guilds/Guild.cpp +++ b/src/server/game/Guilds/Guild.cpp @@ -1031,6 +1031,8 @@ Item* Guild::BankMoveItemData::StoreItem(SQLTransaction& trans, Item* pItem) 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 101912e6692..22846e67002 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1139,7 +1139,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 72380f32391..2b53514633d 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 cf200c689af..0d537901ebe 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_thorim.cpp @@ -788,7 +788,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; |