Merge pull request #7839 from Warpten/soulwell

Core/Spells: Fixed Soulwell charges removal on use.
This commit is contained in:
kandera committed 2012-10-05 06:04:24 -07:00
commit 42c047bebc
4 files changed
+121 -58

No files matched your search

@@ -1080,7 +1080,8 @@ void GameObject::Use(Unit* user)
if (sScriptMgr->OnGossipHello(playerUser, this))
return;
AI()->GossipHello(playerUser);
if (AI()->GossipHello(playerUser))
return;
}
// If cooldown data present in template
+2 -1
View File
@@ -303,7 +303,8 @@ void WorldSession::HandleGameobjectReportUse(WorldPacket& recvPacket)
if (!go->IsWithinDistInMap(_player, INTERACTION_DISTANCE))
return;
go->AI()->GossipHello(_player);
if (go->AI()->GossipHello(_player))
return;
_player->UpdateAchievementCriteria(ACHIEVEMENT_CRITERIA_TYPE_USE_GAMEOBJECT, go->GetEntry());
}
+2 -1
View File
@@ -2001,7 +2001,8 @@ void Spell::SendLoot(uint64 guid, LootType loottype)
if (sScriptMgr->OnGossipHello(player, gameObjTarget))
return;
gameObjTarget->AI()->GossipHello(player);
if (gameObjTarget->AI()->GossipHello(player))
return;
switch (gameObjTarget->GetGoType())
{