mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-22 13:37:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[7469] Allow scripting aura spell triggering in case not existed spell.

Browse source
This commit is contained in:
VladimirMangos 2009-03-16 18:22:11 +03:00
parent 5d6cb5fe80
commit e904d7c2c0
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/game/SpellAuras.cpp
View file

@ -39,6 +39,7 @@
#include "Formulas.h" #include "Formulas.h"
#include "BattleGround.h" #include "BattleGround.h"
#include "CreatureAI.h" #include "CreatureAI.h"
#include "ScriptCalls.h"
#include "Util.h" #include "Util.h"
#include "GridNotifiers.h" #include "GridNotifiers.h"
#include "GridNotifiersImpl.h" #include "GridNotifiersImpl.h"
@ -1437,7 +1438,7 @@ void Aura::TriggerSpell()
caster->ModifyPower( POWER_MANA, mana ); caster->ModifyPower( POWER_MANA, mana );
caster->SendEnergizeSpellLog(caster, 23493, mana, POWER_MANA); caster->SendEnergizeSpellLog(caster, 23493, mana, POWER_MANA);
} }
break; return;
} }
// // Stoneclaw Totem Passive TEST // // Stoneclaw Totem Passive TEST
// case 23792: break; // case 23792: break;
@ -1505,8 +1506,6 @@ void Aura::TriggerSpell()
// case 28522: break; // case 28522: break;
// // Silithyst // // Silithyst
// case 29519: break; // case 29519: break;
// // Inoculate Nestlewood Owlkin
case 29528: trigger_spell_id = 28713; break;
// // Overload // // Overload
// case 29768: break; // case 29768: break;
// // Return Fire // // Return Fire
@ -1548,7 +1547,6 @@ void Aura::TriggerSpell()
creature->SetHealth(0); // just for nice GM-mode view creature->SetHealth(0); // just for nice GM-mode view
} }
return; return;
break;
} }
// Quake // Quake
case 30576: trigger_spell_id = 30571; break; case 30576: trigger_spell_id = 30571; break;
@ -1929,13 +1927,9 @@ void Aura::TriggerSpell()
default: default:
break; break;
} }
// Reget trigger spell proto // Reget trigger spell proto
triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id); triggeredSpellInfo = sSpellStore.LookupEntry(trigger_spell_id);
if(triggeredSpellInfo == NULL)
{
sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",GetId(),GetEffIndex());
return;
}
} }
else else
{ {
@ -1987,8 +1981,12 @@ void Aura::TriggerSpell()
} }
} }
} }
// All ok cast by default case // All ok cast by default case
caster->CastSpell(target, triggeredSpellInfo, true, 0, this); if(triggeredSpellInfo)
caster->CastSpell(target, triggeredSpellInfo, true, 0, this);
else if(target->GetTypeId()!=TYPEID_UNIT || !Script->EffectDummyCreature(caster, GetId(), GetEffIndex(), (Creature*)target))
sLog.outError("Aura::TriggerSpell: Spell %u have 0 in EffectTriggered[%d], not handled custom case?",GetId(),GetEffIndex());
} }
void Aura::TriggerSpellWithValue() void Aura::TriggerSpellWithValue()

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "7468" #define REVISION_NR "7469"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__