Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/Movement/Spline/MoveSplineInit.cpp
This commit is contained in:
commit
1866c7a038
14 files changed
+102
-31
No files matched your search
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user