Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 05:43:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps

Browse Source
This commit is contained in:
Subv
2012-09-03 16:11:18 -05:00
parent a9e672ab1d b979e81dde
commit c0b031af4d
4 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dep/g3dlite/source/RegistryUtil.cpp
View File

@@ -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) {

1
sql/updates/world/2012_09_03_01_world_gameobject_template.sql Normal file
View File

@@ -0,0 +1 @@
UPDATE `gameobject_template` SET `flags`=40 WHERE `entry`=186371; -- Zeppelin

2
sql/updates/world/2012_09_03_02_world_quest_template.sql Normal file
View File

@@ -0,0 +1,2 @@
-- Stalk the Stalker (9719) quest requirements fix
UPDATE `quest_template` SET `RequiredRaces` = 0 WHERE `Id` = 9719;

3
src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp
View File

@@ -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());
@@ -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)