From 9a67aaa8b85b72732d2103c3b013cd70281453cb Mon Sep 17 00:00:00 2001 From: kaelima Date: Mon, 27 Jun 2011 20:22:53 +0200 Subject: DB/Creature: - Nuke the hacky column DeathState. - Removed some hacks from Kologarn script, including some cleanup. - Removed set deathstate command. BIG thanks to Malcrom for replacing all creatures that had deathstate with proper dynamicflags/auras. --- src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'src/server/scripts/OutdoorPvP') diff --git a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp index bff1e8e011d..eb9f2b1928a 100755 --- a/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp +++ b/src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp @@ -63,19 +63,14 @@ uint32 OPvPCapturePointNA::GetAliveGuardsCount() case NA_NPC_GUARD_13: case NA_NPC_GUARD_14: case NA_NPC_GUARD_15: + { + if (Creature* cr = HashMapHolder::Find(itr->second)) { - if (Creature* cr = HashMapHolder::Find(itr->second)) - { - if (cr->isAlive()) - ++cnt; - } - else if (CreatureData const* cd = sObjectMgr->GetCreatureData(GUID_LOPART(itr->second))) - { - if (!cd->is_dead) - ++cnt; - } + if (cr->isAlive()) + ++cnt; } - break; + } + break; default: break; } -- cgit v1.2.3