Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Browse Source 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
Shauren
2013-06-01 18:34:58 +02:00
parent 7d64b56db1 fb718d20aa
commit 1866c7a038
14 changed files with 102 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/server/scripts/Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp
View File

@@ -1013,8 +1013,11 @@ class npc_dream_portal : public CreatureScript
{
}
void OnSpellClick(Unit* /*clicker*/)
void OnSpellClick(Unit* /*clicker*/, bool& result)
{
if (!result)
return;
_used = true;
me->DespawnOrUnsummon();
}

5
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
View File

@@ -709,8 +709,11 @@ class boss_flame_leviathan_overload_device : public CreatureScript
{
}
void OnSpellClick(Unit* /*clicker*/)
void OnSpellClick(Unit* /*clicker*/, bool& result)
{
if (!result)
return;
if (me->GetVehicle())
{
me->RemoveFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK);

4
src/server/scripts/Northrend/Ulduar/Ulduar/boss_yogg_saron.cpp
View File

@@ -1421,8 +1421,10 @@ class npc_descend_into_madness : public CreatureScript
{
npc_descend_into_madnessAI(Creature* creature) : PassiveAI(creature), _instance(creature->GetInstanceScript()) { }
void OnSpellClick(Unit* clicker)
void OnSpellClick(Unit* clicker, bool& result)
{
if (!result)
return;
clicker->RemoveAurasDueToSpell(SPELL_BRAIN_LINK);
me->DespawnOrUnsummon();
}