From 9181ecef202f4f6267674ba2f1588e84209719c8 Mon Sep 17 00:00:00 2001 From: megamage Date: Thu, 18 Jun 2009 17:07:40 -0500 Subject: [8042] Speedup search creature/pet/vehicle by guid. Author: Ambal --HG-- branch : trunk --- src/game/ObjectAccessor.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp index 70a1bada3f9..b420e4af4b2 100644 --- a/src/game/ObjectAccessor.cpp +++ b/src/game/ObjectAccessor.cpp @@ -51,11 +51,14 @@ ObjectAccessor::~ObjectAccessor() {} Creature* ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const &u, uint64 guid) { - if(Creature *unit = GetPet(guid)) - return unit; + if(IS_PLAYER_GUID(guid)) + return NULL; + + if(IS_PET_GUID(guid)) + return GetPet(guid); - if(Creature *unit = GetVehicle(guid)) - return unit; + if(IS_VEHICLE_GUID(guid)) + return GetVehicle(guid); return u.GetMap()->GetCreature(guid); } -- cgit v1.2.3