From 14367ca8c0710f4f87fd1c16ea1d896674631604 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 14 Sep 2014 12:37:04 -0230 Subject: Scripting/Stand spell: Remove UNIT_FIELD_FLAGS change from spell script. --- src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp | 3 ++- src/server/scripts/Spells/spell_generic.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp index 0be61cc2ec8..18b9a3040fe 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_xt002.cpp @@ -397,8 +397,9 @@ class boss_xt002 : public CreatureScript Talk(SAY_HEART_CLOSED); Talk(EMOTE_HEART_CLOSED); - DoCast(me, SPELL_STAND); + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); me->SetReactState(REACT_AGGRESSIVE); + DoCast(me, SPELL_STAND); _phase = 1; diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 3882bbe7864..e14a9934fac 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -3697,8 +3697,8 @@ public: if (!target) return; - target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE); target->SetByteValue(UNIT_FIELD_BYTES_1, 0, UNIT_STAND_STATE_STAND); + target->HandleEmoteCommand(EMOTE_STATE_NONE); } void Register() override -- cgit v1.2.3 From 66c90122ec03bdb884e57286ccccc91a340fa010 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sun, 14 Sep 2014 12:16:07 -0300 Subject: Scripts/OnyxiaLair: - Potential null pointer crash fix - Reset react state properly on wipes during air phase --- src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp index 62c85491a20..0a6b2e88b26 100644 --- a/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp +++ b/src/server/scripts/Kalimdor/OnyxiasLair/boss_onyxia.cpp @@ -153,7 +153,7 @@ public: SetCombatMovement(true); _Reset(); - + me->SetReactState(REACT_AGGRESSIVE); instance->SetData(DATA_ONYXIA_PHASE, Phase); instance->DoStopTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } @@ -162,12 +162,10 @@ public: { _EnterCombat(); Talk(SAY_AGGRO); - events.ScheduleEvent(EVENT_FLAME_BREATH, urand(10000, 20000)); events.ScheduleEvent(EVENT_TAIL_SWEEP, urand(15000, 20000)); events.ScheduleEvent(EVENT_CLEAVE, urand(2000, 5000)); events.ScheduleEvent(EVENT_WING_BUFFET, urand(10000, 20000)); - instance->DoStartTimedAchievement(ACHIEVEMENT_TIMED_TYPE_EVENT, ACHIEV_TIMED_START_EVENT); } @@ -331,9 +329,10 @@ public: { if (HealthBelowPct(65)) { + if (Unit* target = me->GetVictim()) + tankGUID = target->GetGUID(); SetCombatMovement(false); Phase = PHASE_BREATH; - tankGUID = me->GetVictim()->GetGUID(); me->SetReactState(REACT_PASSIVE); me->AttackStop(); me->GetMotionMaster()->MovePoint(10, Phase2Location); -- cgit v1.2.3 From 92d514d0c9e2b6c7b778ddec8991da850f10ea17 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sun, 14 Sep 2014 12:55:48 -0300 Subject: Scripts/Misc: Some code style fixes for old code --- .../HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp | 2 -- src/server/scripts/Spells/spell_quest.cpp | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp index 82f101980fe..5baaebc0d7b 100644 --- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp @@ -40,7 +40,6 @@ enum Says enum Spells { SPELL_MORTAL_WOUND = 30641, - H_SPELL_MORTAL_WOUND = 36814, SPELL_SURGE = 34645, SPELL_RETALIATION = 22857 }; @@ -78,7 +77,6 @@ class boss_watchkeeper_gargolmar : public CreatureScript } void MoveInLineOfSight(Unit* who) override - { if (!me->GetVictim() && me->CanCreatureAttack(who)) { diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 8373752ee1f..92eeef5e8a8 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -280,8 +280,8 @@ class spell_q11396_11399_force_shield_arcane_purple_x3 : public SpellScriptLoade void HandleEffectApply(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) { Unit* target = GetTarget(); - target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); - target->AddUnitState(UNIT_STATE_ROOT); + target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC); + target->AddUnitState(UNIT_STATE_ROOT); } void HandleEffectRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/) -- cgit v1.2.3 From 7d26a2ccd46bd8475c1dad90d7bb9480c3089314 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Sun, 14 Sep 2014 20:58:05 +0200 Subject: Scripts/Commands: Fix ".npc info" immune mask output Fix ".npc info" showing wrong immune mask list Fixes #12358 --- src/server/scripts/Commands/cs_npc.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Commands/cs_npc.cpp b/src/server/scripts/Commands/cs_npc.cpp index 79a707f1377..00e5fc22d92 100644 --- a/src/server/scripts/Commands/cs_npc.cpp +++ b/src/server/scripts/Commands/cs_npc.cpp @@ -761,8 +761,8 @@ public: handler->PSendSysMessage(npcFlagTexts[i].Name, npcFlagTexts[i].Value); handler->PSendSysMessage(LANG_NPCINFO_MECHANIC_IMMUNE, mechanicImmuneMask); - for (uint8 i = 0; i < MAX_MECHANIC; ++i) - if ((mechanicImmuneMask << 1) & mechanicImmunes[i].Value) + for (uint8 i = 1; i < MAX_MECHANIC; ++i) + if (mechanicImmuneMask & (1 << (mechanicImmunes[i].Value - 1))) handler->PSendSysMessage("%s (0x%X)", mechanicImmunes[i].Name, mechanicImmunes[i].Value); return true; -- cgit v1.2.3 From b0270d547fbe7f381fa14bad6e679da446e64a87 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Sun, 14 Sep 2014 21:42:39 +0200 Subject: Core: Remove whitespace --- sql/updates/world/2014_09_14_04_world_toc5.sql | 2 +- .../CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp | 2 +- src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp | 2 +- src/server/shared/Networking/Socket.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/scripts') diff --git a/sql/updates/world/2014_09_14_04_world_toc5.sql b/sql/updates/world/2014_09_14_04_world_toc5.sql index 1c3b36f9b1f..81975bd08ee 100644 --- a/sql/updates/world/2014_09_14_04_world_toc5.sql +++ b/sql/updates/world/2014_09_14_04_world_toc5.sql @@ -29,4 +29,4 @@ INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `use (35641, 46598, 0, 0), (35634, 46598, 0, 0), -(35491, 46598, 0, 0); \ No newline at end of file +(35491, 46598, 0, 0); diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp index ec7aa742975..1d2ed933243 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/boss_salramm_the_fleshcrafter.cpp @@ -68,7 +68,7 @@ class boss_salramm : public CreatureScript events.ScheduleEvent(EVENT_CURSE_FLESH, 30000); events.ScheduleEvent(EVENT_SUMMON_GHOULS, urand(19000, 24000)); events.ScheduleEvent(EVENT_SHADOW_BOLT, urand(8000, 12000)); - events.ScheduleEvent(EVENT_STEAL_FLESH, 12345); /// @todo: adjust timer + events.ScheduleEvent(EVENT_STEAL_FLESH, 12345); /// @todo: adjust timer } void ExecuteEvent(uint32 eventId) override diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp index 6ace4eb61a1..a31aff259d1 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp @@ -150,7 +150,7 @@ class boss_svala : public CreatureScript void Reset() override { _Reset(); - + SetCombatMovement(true); if (_introCompleted) diff --git a/src/server/shared/Networking/Socket.h b/src/server/shared/Networking/Socket.h index d1f143aeb1e..dfff60a380b 100644 --- a/src/server/shared/Networking/Socket.h +++ b/src/server/shared/Networking/Socket.h @@ -148,7 +148,7 @@ protected: return true; _isWritingAsync = true; - + #ifdef BOOST_ASIO_HAS_IOCP MessageBuffer& buffer = _writeQueue.front(); _socket.async_write_some(boost::asio::buffer(buffer.GetReadPointer(), buffer.GetActiveSize()), std::bind(&Socket::WriteHandler, -- cgit v1.2.3 From e4d875a2498b685c8898fce2f8472cac85660a85 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Sun, 14 Sep 2014 18:40:45 -0300 Subject: Scripts/ToCR: Set Anub'arak's respawn delay * This needs to be done manually since he's a summon. Closes https://github.com/TrinityCore/TrinityCore/issues/10587 --- .../TrialOfTheCrusader/instance_trial_of_the_crusader.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 949ee652d81..a8d3f223664 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -173,6 +173,7 @@ class instance_trial_of_the_crusader : public InstanceMapScript break; case NPC_ANUBARAK: AnubarakGUID = creature->GetGUID(); + creature->SetRespawnDelay(7 * DAY); break; default: break; -- cgit v1.2.3