diff options
Diffstat (limited to 'src')
6 files changed, 10 insertions, 17 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index 58a3dee2e6f..c142a3f479f 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2090,7 +2090,7 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u } if (closest.first != 0) - CAST_AI(SmartAI, creature->AI())->StartPath(false, closest.first, true, nullptr, closest.second); + ENSURE_AI(SmartAI, creature->AI())->StartPath(false, closest.first, true, nullptr, closest.second); } } } diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp index e2f4df23162..508fd47ed8d 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp +++ b/src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp @@ -391,12 +391,12 @@ void BattlegroundAB::_NodeOccupied(uint8 node, Team team) void BattlegroundAB::_NodeDeOccupied(uint8 node) { + //only dynamic nodes, no start points if (node >= BG_AB_DYNAMIC_NODES_COUNT) return; //remove bonus honor aura trigger creature when node is lost - if (node < BG_AB_DYNAMIC_NODES_COUNT)//only dynamic nodes, no start points - DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides + DelCreature(node+7);//NULL checks are in DelCreature! 0-6 spirit guides RelocateDeadPlayers(BgCreatures[node]); diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index d4eb2f3ff61..0bc8ac121a1 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8172,7 +8172,7 @@ void ObjectMgr::LoadQuestRelationsHelper(QuestRelations& map, QuestRelationsReve if (reverseMap) reverseMap->insert(QuestRelationsReverse::value_type(quest, id)); } - else if (starter) + else poolRelationMap->insert(PooledQuestRelation::value_type(quest, id)); ++count; diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index e373411b120..15bb4b7e14d 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -2479,9 +2479,6 @@ void Spell::EffectEnchantItemTmp(SpellEffIndex effIndex) if (!player) return; - if (!itemTarget) - return; - uint32 enchant_id = effectInfo->MiscValue; if (!enchant_id) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp index e004ebeb87d..c1feefc773c 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_prince_malchezaar.cpp @@ -490,8 +490,7 @@ public: { if (axe->GetVictim()) ResetThreat(axe->GetVictim(), axe); - if (target) - AddThreat(target, 1000000.0f, axe); + AddThreat(target, 1000000.0f, axe); } } } diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp index e2c60d06c66..682f43b487c 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp @@ -561,15 +561,12 @@ public: Rebirth = true; } - if (Rebirth) + if (Death_Timer <= diff) { - if (Death_Timer <= diff) - { - me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); - me->DisappearAndDie(); - Rebirth = false; - } else Death_Timer -= diff; - } + me->SummonCreature(CREATURE_PHOENIX_EGG, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_TIMED_OR_CORPSE_DESPAWN, 45000); + me->DisappearAndDie(); + Rebirth = false; + } else Death_Timer -= diff; } if (!UpdateVictim()) |