From 09f682b11eeb5c29e694172179ea23f28458b711 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sat, 27 Sep 2014 06:03:57 +0200 Subject: [PATCH 1/3] Core/Spells: Fix typo --- src/server/scripts/Spells/spell_holiday.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp index 2d993e771d..e43249ff8a 100644 --- a/src/server/scripts/Spells/spell_holiday.cpp +++ b/src/server/scripts/Spells/spell_holiday.cpp @@ -560,12 +560,12 @@ class spell_brewfest_ram : public SpellScriptLoader break; case SPELL_RAM_CANTER: target->CastCustomSpell(SPELL_RAM_FATIGUE, SPELLVALUE_AURA_STACK, 1, target, TRIGGERED_FULL_MASK); - if (aurEff->GetTickNumber() == 4) + if (aurEff->GetTickNumber() == 8) target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_YELLOW, true); break; case SPELL_RAM_GALLOP: target->CastCustomSpell(SPELL_RAM_FATIGUE, SPELLVALUE_AURA_STACK, target->HasAura(SPELL_RAM_FATIGUE) ? 4 : 5 /*Hack*/, target, TRIGGERED_FULL_MASK); - if (aurEff->GetTickNumber() == 4) + if (aurEff->GetTickNumber() == 8) target->CastSpell(target, SPELL_BREWFEST_QUEST_SPEED_BUNNY_RED, true); break; default: From 42177d9f2cfed726c6a9f83158c454ef4ea5a90d Mon Sep 17 00:00:00 2001 From: Shauren Date: Sat, 27 Sep 2014 10:56:22 +0200 Subject: [PATCH 2/3] Fixed GCC build --- src/server/shared/Debugging/Errors.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/shared/Debugging/Errors.h b/src/server/shared/Debugging/Errors.h index f65d06cab0..e6da19eb00 100644 --- a/src/server/shared/Debugging/Errors.h +++ b/src/server/shared/Debugging/Errors.h @@ -42,7 +42,7 @@ namespace Trinity #define ASSERT_END #endif -#define WPAssert(cond, ...) ASSERT_BEGIN do { if (!(cond)) Trinity::Assert(__FILE__, __LINE__, __FUNCTION__, #cond, __VA_ARGS__); } while(0) ASSERT_END +#define WPAssert(cond, ...) ASSERT_BEGIN do { if (!(cond)) Trinity::Assert(__FILE__, __LINE__, __FUNCTION__, #cond, ##__VA_ARGS__); } while(0) ASSERT_END #define WPFatal(cond, msg) ASSERT_BEGIN do { if (!(cond)) Trinity::Fatal(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END #define WPError(cond, msg) ASSERT_BEGIN do { if (!(cond)) Trinity::Error(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END #define WPWarning(cond, msg) ASSERT_BEGIN do { if (!(cond)) Trinity::Warning(__FILE__, __LINE__, __FUNCTION__, (msg)); } while(0) ASSERT_END From 3282dea5c5ef3205cf3409c4f03480b7f2221d69 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sat, 27 Sep 2014 06:29:04 -0300 Subject: [PATCH 3/3] DB/SAI: Re-add SAI for Sprinkle that was accidentally deleted at d672e78a5b7a98f4b58936a0bd1c948028005dc0 --- sql/updates/world/2014_09_27_02_world.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 sql/updates/world/2014_09_27_02_world.sql diff --git a/sql/updates/world/2014_09_27_02_world.sql b/sql/updates/world/2014_09_27_02_world.sql new file mode 100644 index 0000000000..aabe173316 --- /dev/null +++ b/sql/updates/world/2014_09_27_02_world.sql @@ -0,0 +1,4 @@ +-- +DELETE FROM `smart_scripts` WHERE `entryorguid` = 7583 AND `id` = 1 AND `source_type` = 0; +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(7583, 0, 1, 0, 8, 0, 100, 0, 17166, 0, 0, 0, 33, 7583, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Sprinkle - On Spellhit \'Release Umi\'s Yeti\' - Quest Credit \'Are We There, Yeti?\'');