Erik Strandberg authored and Aokromes committed 2017-12-10 00:37:21 +00:00
1 parent dcc4d29276
commit a3b16c040b
122 files changed
+6029 -5246

No files matched your search

+14 -16
View File
@@ -1675,9 +1675,7 @@ void Spell::SendLoot(ObjectGuid guid, LootType loottype)
return;
}
if (sScriptMgr->OnGossipHello(player, gameObjTarget))
return;
player->PlayerTalkClass->ClearMenus();
if (gameObjTarget->AI()->GossipHello(player, false))
return;
@@ -4153,23 +4151,23 @@ void Spell::EffectSummonObject(SpellEffIndex effIndex)
void Spell::EffectSummonDynObj(SpellEffIndex effIndex)
{
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT)
return;
if (effectHandleMode != SPELL_EFFECT_HANDLE_HIT)
return;
Player* player = m_caster->ToPlayer();
if (!player)
return;
Player* player = m_caster->ToPlayer();
if (!player)
return;
float radius = m_spellInfo->Effects[effIndex].CalcRadius(m_caster);
DynamicObject* dynObj = new DynamicObject(false);
float radius = m_spellInfo->Effects[effIndex].CalcRadius(m_caster);
DynamicObject* dynObj = new DynamicObject(false);
if (!dynObj->CreateDynamicObject(m_caster->GetMap()->GenerateLowGuid<HighGuid::DynamicObject>(), m_caster, m_spellInfo, *destTarget, radius, DYNAMIC_OBJECT_RAID_MARKER))
{
delete dynObj;
return;
}
{
delete dynObj;
return;
}
int32 duration = m_spellInfo->GetDuration();
dynObj->SetDuration(duration);
int32 duration = m_spellInfo->GetDuration();
dynObj->SetDuration(duration);
}
void Spell::EffectSummonRaidMarker(SpellEffIndex effIndex)