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

This commit is contained in:
Subv
2012-09-03 16:11:18 -05:00
4 changed files with 6 additions and 2 deletions

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)