aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSubv <s.v.h21@hotmail.com>2012-09-03 16:11:18 -0500
committerSubv <s.v.h21@hotmail.com>2012-09-03 16:11:18 -0500
commitc0b031af4d3e8de03be491156dd13ac78f6770dc (patch)
tree0749886a3010266dec9ce81b489306f7df56c903 /src
parenta9e672ab1d33a3502381d4b33f679a9d1f1f2087 (diff)
parentb979e81dde4185d272f7d22d4e252e4ecc59b280 (diff)
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Diffstat (limited to 'src')
-rw-r--r--src/server/scripts/Outland/HellfireCitadel/BloodFurnace/instance_blood_furnace.cpp3
1 files changed, 2 insertions, 1 deletions
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..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());
@@ -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)