Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4

Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_03_22_00_world.sql
	sql/updates/world/2015_03_23_00_world.sql
	sql/updates/world/2015_03_23_01_world.sql
	sql/updates/world/2015_03_23_02_world.sql
	sql/updates/world/2015_03_23_03_world.sql
	sql/updates/world/2015_03_23_07_world.sql
	sql/updates/world/2015_03_24_00_world.sql
	sql/updates/world/2015_03_25_00_world.sql
	sql/updates/world/2015_03_25_01_world.sql
	sql/updates/world/2015_03_26_00_world.sql
	sql/updates/world/2015_03_26_01_world.sql
	sql/updates/world/2015_03_26_02_world.sql
	sql/updates/world/2015_03_28_00_world.sql
	sql/updates/world/2015_03_28_01_world.sql
This commit is contained in:
Carbenium committed 2015-07-22 00:37:27 +02:00
commit 963150dc8e
17 files changed
+827 -50

No files matched your search

@@ -3617,6 +3617,43 @@ class spell_gen_eject_all_passengers : public SpellScriptLoader
}
};
class spell_gen_eject_passenger : public SpellScriptLoader
{
public:
spell_gen_eject_passenger() : SpellScriptLoader("spell_gen_eject_passenger") { }
class spell_gen_eject_passenger_SpellScript : public SpellScript
{
PrepareSpellScript(spell_gen_eject_passenger_SpellScript);
bool Validate(SpellInfo const* spellInfo) override
{
if (spellInfo->Effects[EFFECT_0].CalcValue() < 1)
return false;
return true;
}
void EjectPassenger(SpellEffIndex /*effIndex*/)
{
if (Vehicle* vehicle = GetHitUnit()->GetVehicleKit())
{
if (Unit* passenger = vehicle->GetPassenger(GetEffectValue() - 1))
passenger->ExitVehicle();
}
}
void Register() override
{
OnEffectHitTarget += SpellEffectFn(spell_gen_eject_passenger_SpellScript::EjectPassenger, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
}
};
SpellScript* GetSpellScript() const override
{
return new spell_gen_eject_passenger_SpellScript();
}
};
enum GMFreeze
{
SPELL_GM_FREEZE = 9454
@@ -4111,6 +4148,7 @@ void AddSC_generic_spell_scripts()
new spell_gen_wg_water();
new spell_gen_whisper_gulch_yogg_saron_whisper();
new spell_gen_eject_all_passengers();
new spell_gen_eject_passenger();
new spell_gen_gm_freeze();
new spell_gen_stand();
new spell_gen_mixology_bonus();