Merge remote-tracking branch 'origin/master' into 4.3.4

This commit is contained in:
Nay
2012-09-04 01:04:31 +01:00
6 changed files with 23 additions and 4 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());