From fb85980ebcd0596e561f2ad6ca6d7691e4962b92 Mon Sep 17 00:00:00 2001 From: talamortis Date: Sun, 23 Oct 2016 22:39:35 +0100 Subject: [PATCH 1/2] Bloodlord Mandokir Say Fix Fix text from when Boss Casts Threatening Gaze --- data/sql/updates/pending_db_world/rev_1477254708321947900.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1477254708321947900.sql diff --git a/data/sql/updates/pending_db_world/rev_1477254708321947900.sql b/data/sql/updates/pending_db_world/rev_1477254708321947900.sql new file mode 100644 index 000000000..fe7bed88e --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1477254708321947900.sql @@ -0,0 +1,3 @@ ++INSERT INTO version_db_world(`sql_rev`) VALUES ('1477254708321947900'); ++ ++UPDATE `creature_text` SET `text` = "$N! I'm watching you!" WHERE `entry` = "11382" AND `groupid` = "2" From 251adf115f053fedb6e9944386b6dfaf244daebe Mon Sep 17 00:00:00 2001 From: talamortis Date: Tue, 25 Oct 2016 19:41:23 +0100 Subject: [PATCH 2/2] boss_mandokir.cpp Boss will no longer despawn after he has done his lap and should return to the correct position when Speaker is dead (at the bottom of the stairs) --- src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp b/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp index 3ae8580cd..6ff8bcaa7 100644 --- a/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp +++ b/src/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp @@ -104,14 +104,14 @@ class boss_mandokir : public CreatureScript { if (me->GetPositionZ() > 140.0f) { - _Reset(); + killCount = 0; - me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC); events.ScheduleEvent(EVENT_CHECK_START, 1000); if (Creature* speaker = ObjectAccessor::GetCreature(*me, instance->GetData64(NPC_VILEBRANCH_SPEAKER))) if (!speaker->IsAlive()) speaker->Respawn(true); } + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC); summons.DespawnAll(); me->Mount(MODEL_OHGAN_MOUNT); } @@ -174,7 +174,7 @@ class boss_mandokir : public CreatureScript { me->SetHomePosition(PosMandokir[0]); instance->SetBossState(DATA_MANDOKIR, NOT_STARTED); - me->DespawnOrUnsummon(6000); // No idea how to respawn on wipe. + } } } @@ -202,7 +202,6 @@ class boss_mandokir : public CreatureScript break; case EVENT_STARTED: me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC|UNIT_FLAG_IMMUNE_TO_NPC); - me->GetMotionMaster()->MovePath(PATH_MANDOKIR, false); break; default: break;