From 8c4dd52d45a45e9682371b1b524d86bcbb3271b5 Mon Sep 17 00:00:00 2001 From: WyldePointer Date: Wed, 6 Mar 2013 13:48:49 +0500 Subject: Update SQLOperation.h Extra ';'. --- src/server/shared/Database/SQLOperation.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/shared/Database/SQLOperation.h b/src/server/shared/Database/SQLOperation.h index 0c000848477..400355e7c76 100644 --- a/src/server/shared/Database/SQLOperation.h +++ b/src/server/shared/Database/SQLOperation.h @@ -59,7 +59,7 @@ class MySQLConnection; class SQLOperation : public ACE_Method_Request { public: - SQLOperation(): m_conn(NULL) {}; + SQLOperation(): m_conn(NULL) {} virtual int call() { Execute(); -- cgit v1.2.3 From 8993eef7231ab558a98f1403e1cf7d7a5ab158dd Mon Sep 17 00:00:00 2001 From: Trista Date: Thu, 7 Mar 2013 04:53:51 +0200 Subject: Scripts/Eye of Eternity: Fix vehicle crashes * I tought if a spell would hit all targets on map then the force cast would be cast for each, apparently I was wrong since it had unlimited implicit targets. * Remove a condition with target mask players since there is a attribute that takes care of that. Closes #9365 --- sql/updates/world/2013_03_07_00_world_conditions.sql | 2 ++ .../Northrend/Nexus/EyeOfEternity/boss_malygos.cpp | 17 +++++++++-------- 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 sql/updates/world/2013_03_07_00_world_conditions.sql (limited to 'src') diff --git a/sql/updates/world/2013_03_07_00_world_conditions.sql b/sql/updates/world/2013_03_07_00_world_conditions.sql new file mode 100644 index 00000000000..31b9d1a1d25 --- /dev/null +++ b/sql/updates/world/2013_03_07_00_world_conditions.sql @@ -0,0 +1,2 @@ +-- Delete condition that is already covered by spell attribute +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=58846; diff --git a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp index df829f27c0c..27331acca2b 100644 --- a/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp +++ b/src/server/scripts/Northrend/Nexus/EyeOfEternity/boss_malygos.cpp @@ -19,9 +19,13 @@ SDName: Boss Malygos Script Data End */ -/* Add support for using Exit Portal while on drake and find why at 100 Z ground - falling creature/player bodies aren't stopped (when players reach it should die). - Also there is release button unavailability sometimes not sure why. */ +/* Main problems needing most attention: + 1) Add support for using Exit Portal while on drake which means to + find seat flag that allows casting on passenger or something that + will prevent valid target filtering. + 2) Find what cause client not sending release now availability + if player dies after far falling. For now player needs to logout to get body after + if release button remain unavailable after box popping.*/ #include "ScriptMgr.h" #include "ScriptedCreature.h" @@ -2174,9 +2178,7 @@ class spell_alexstrasza_bunny_destroy_platform_boom_visual : public SpellScriptL void HandleDummy(SpellEffIndex /*effIndex*/) { if (Creature* target = GetHitCreature()) - { target->CastSpell(target, SPELL_DESTROY_PLATFORM_EVENT); - } } void Register() @@ -2215,14 +2217,13 @@ class spell_alexstrasza_bunny_destroy_platform_event : public SpellScriptLoader void HandleScript(SpellEffIndex /*effIndex*/) { - Creature* caster = GetCaster()->ToCreature(); - caster->CastSpell(caster, SPELL_SUMMON_RED_DRAGON_BUDDY_F_CAST, true); + GetCaster()->CastSpell((Unit*)NULL, SPELL_SUMMON_RED_DRAGON_BUDDY_F_CAST); } void Register() { OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleSendEvent, EFFECT_0, SPELL_EFFECT_SEND_EVENT); - OnEffectHitTarget += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); + OnEffectHit += SpellEffectFn(spell_alexstrasza_bunny_destroy_platform_event_SpellScript::HandleScript, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT); } }; -- cgit v1.2.3 From 3a9c26225ef9737cac3095ab8aa24e271b9800f0 Mon Sep 17 00:00:00 2001 From: click Date: Thu, 7 Mar 2013 22:21:21 +0100 Subject: Core: Fix non-PCH compile (missing headers on some of the scripts) --- src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp | 1 + src/server/scripts/Kalimdor/zone_moonglade.cpp | 3 ++- src/server/scripts/Spells/spell_holiday.cpp | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 3f4b1d82b8d..5b6993dfef0 100644 --- a/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp @@ -39,6 +39,7 @@ EndContentData */ #include "ScriptedGossip.h" #include "Cell.h" #include "CellImpl.h" +#include "GridNotifiersImpl.h" #include "GridNotifiers.h" /*###### diff --git a/src/server/scripts/Kalimdor/zone_moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index b5be4ac1a6d..b6a0c1e9d1e 100644 --- a/src/server/scripts/Kalimdor/zone_moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp @@ -37,9 +37,10 @@ EndContentData */ #include "ScriptedGossip.h" #include "Player.h" #include "SpellInfo.h" +#include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "Cell.h" #include "CellImpl.h" -#include "GridNotifiers.h" /*###### ## npc_bunthen_plainswind diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 90bb689a9a9..37b6a202ed4 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -27,6 +27,7 @@ #include "SpellScript.h" #include "SpellAuraEffects.h" #include "GridNotifiers.h" +#include "GridNotifiersImpl.h" #include "CellImpl.h" // 45102 Romantic Picnic -- cgit v1.2.3