mirror of
https://github.com/TrinityCore/TrinityCore.git
synced 2026-01-27 12:22:39 +01:00
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/game/AuctionHouse/AuctionHouseMgr.h src/server/game/Entities/Creature/Creature.cpp src/server/game/Entities/Player/Player.cpp src/server/game/Entities/Unit/StatSystem.cpp src/server/game/Entities/Unit/Unit.cpp src/server/game/Entities/Vehicle/Vehicle.cpp src/server/game/Handlers/NPCHandler.cpp
This commit is contained in:
@@ -3634,6 +3634,45 @@ class spell_gen_orc_disguise : public SpellScriptLoader
|
||||
}
|
||||
};
|
||||
|
||||
enum WhisperGulchYoggSaronWhisper
|
||||
{
|
||||
SPELL_YOGG_SARON_WHISPER_DUMMY = 29072
|
||||
};
|
||||
|
||||
class spell_gen_whisper_gulch_yogg_saron_whisper : public SpellScriptLoader
|
||||
{
|
||||
public:
|
||||
spell_gen_whisper_gulch_yogg_saron_whisper() : SpellScriptLoader("spell_gen_whisper_gulch_yogg_saron_whisper") { }
|
||||
|
||||
class spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript : public AuraScript
|
||||
{
|
||||
PrepareAuraScript(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript);
|
||||
|
||||
bool Validate(SpellInfo const* /*spellInfo*/)
|
||||
{
|
||||
if (!sSpellMgr->GetSpellInfo(SPELL_YOGG_SARON_WHISPER_DUMMY))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
void HandleEffectPeriodic(AuraEffect const* /*aurEff*/)
|
||||
{
|
||||
PreventDefaultAction();
|
||||
GetTarget()->CastSpell((Unit*)NULL, SPELL_YOGG_SARON_WHISPER_DUMMY, true);
|
||||
}
|
||||
|
||||
void Register()
|
||||
{
|
||||
OnEffectPeriodic += AuraEffectPeriodicFn(spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript::HandleEffectPeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
|
||||
}
|
||||
};
|
||||
|
||||
AuraScript* GetAuraScript() const
|
||||
{
|
||||
return new spell_gen_whisper_gulch_yogg_saron_whisper_AuraScript();
|
||||
}
|
||||
};
|
||||
|
||||
void AddSC_generic_spell_scripts()
|
||||
{
|
||||
new spell_gen_absorb0_hitlimit1();
|
||||
@@ -3722,4 +3761,5 @@ void AddSC_generic_spell_scripts()
|
||||
new spell_gen_two_forms();
|
||||
new spell_gen_darkflight();
|
||||
new spell_gen_orc_disguise();
|
||||
new spell_gen_whisper_gulch_yogg_saron_whisper();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user