From 6acb7f85f438437db3f625e695c1086a1116e215 Mon Sep 17 00:00:00 2001 From: Nay Date: Mon, 3 Sep 2012 17:15:32 +0100 Subject: [PATCH 1/5] DB/GOs: Correct flags of GO 186371 Thanks Joshh Closes #6846 --- sql/updates/world/2012_09_03_01_world_gameobject_template.sql | 1 + 1 file changed, 1 insertion(+) create mode 100644 sql/updates/world/2012_09_03_01_world_gameobject_template.sql diff --git a/sql/updates/world/2012_09_03_01_world_gameobject_template.sql b/sql/updates/world/2012_09_03_01_world_gameobject_template.sql new file mode 100644 index 00000000000..ff0907eee6e --- /dev/null +++ b/sql/updates/world/2012_09_03_01_world_gameobject_template.sql @@ -0,0 +1 @@ +UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=186371; -- Zeppelin From 511beb8c196a6a00375541d82c72494c9a4ccf62 Mon Sep 17 00:00:00 2001 From: nelegalno Date: Mon, 3 Sep 2012 17:18:38 +0100 Subject: [PATCH 2/5] DB/Quests: Fix required races for quest 9719 Closes #7604 --- sql/updates/world/2012_09_03_02_world_quest_template.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2012_09_03_02_world_quest_template.sql diff --git a/sql/updates/world/2012_09_03_02_world_quest_template.sql b/sql/updates/world/2012_09_03_02_world_quest_template.sql new file mode 100644 index 00000000000..0c0a7ce4e40 --- /dev/null +++ b/sql/updates/world/2012_09_03_02_world_quest_template.sql @@ -0,0 +1,2 @@ +-- Stalk the Stalker (9719) quest requirements fix +UPDATE `quest_template` SET `RequiredRaces` = 0 WHERE `Id` = 9719; From 2fe8c2f41e2da6d543d9a22bfc1e8c9335f2eda2 Mon Sep 17 00:00:00 2001 From: Nay Date: Mon, 3 Sep 2012 18:24:35 +0100 Subject: [PATCH 3/5] Dependencies/G3D: Fix build on x64 (change already included in TC's diff) --- dep/g3dlite/source/RegistryUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dep/g3dlite/source/RegistryUtil.cpp b/dep/g3dlite/source/RegistryUtil.cpp index 28ff6955d9b..fc4cebc2ee5 100644 --- a/dep/g3dlite/source/RegistryUtil.cpp +++ b/dep/g3dlite/source/RegistryUtil.cpp @@ -257,7 +257,7 @@ bool RegistryUtil::writeString(const std::string& key, const std::string& value, // static helpers -static HKEY getRootKeyFromString(const char* str, uint32 length) { +static HKEY getRootKeyFromString(const char* str, size_t length) { debugAssert(str); if (str) { From 153e88a16b33bedfd28273030e26914844d60aff Mon Sep 17 00:00:00 2001 From: Gacko Date: Mon, 3 Sep 2012 20:08:17 +0200 Subject: [PATCH 4/5] Core: Blood Furnace - Broggok event Move prisoners back in cages after respawn. They didn't reset correctly for players which were still in the instance after wipe --- .../HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 893f97fe711..629df924ea1 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -316,6 +316,7 @@ class instance_blood_furnace : public InstanceMapScript if (!prisoner->isAlive()) prisoner->Respawn(true); prisoner->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_IMMUNE_TO_NPC | UNIT_FLAG_NON_ATTACKABLE); + prisoner->GetMotionMaster()->MoveTargetedHome(); } void StorePrisoner(Creature* creature) From 913645d5c7301a5d323f98e16a1e4baa972c685a Mon Sep 17 00:00:00 2001 From: Gacko Date: Mon, 3 Sep 2012 22:25:26 +0200 Subject: [PATCH 5/5] Core: Blood furnace - Update method header to lastest rev --- .../HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp index 629df924ea1..ebc7af26aae 100644 --- a/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp +++ b/src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp @@ -133,7 +133,7 @@ class instance_blood_furnace : public InstanceMapScript } } - void OnCreatureDeath(Creature* unit) + void OnUnitDeath(Unit* unit) { if (unit && unit->GetTypeId() == TYPEID_UNIT && unit->GetEntry() == 17398) PrisonerDied(unit->GetGUID());