From 2024c5770123dedf704a7dc9be0a2f99fd65efe8 Mon Sep 17 00:00:00 2001 From: H0zen Date: Sat, 21 May 2016 21:25:25 +0300 Subject: [PATCH] Hunter fix - part 2 (#127) -Now Dismiss Pet/Call Pet combination works again -Fixed also a bug introduced with previous commit --- src/game/Object/Pet.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/Object/Pet.cpp b/src/game/Object/Pet.cpp index 69d8a605..7d1eec7f 100644 --- a/src/game/Object/Pet.cpp +++ b/src/game/Object/Pet.cpp @@ -2161,8 +2161,8 @@ PetDatabaseStatus Pet::GetStatusFromDB(Player* owner) QueryResult* result; // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 result = CharacterDatabase.PQuery("SELECT id, entry, owner, modelid, level, exp, Reactstate, loyaltypoints, loyalty, trainpoint, slot, name, renamed, curhealth, curmana, curhappiness, abdata, TeachSpelldata, savetime, resettalents_cost, resettalents_time, CreatedBySpell, PetType " - "FROM character_pet WHERE owner = '%u' AND (slot = '%u') ", - ownerid, PET_SAVE_AS_CURRENT); + "FROM character_pet WHERE owner = %u AND (slot = %u OR slot > %u)", + ownerid, PET_SAVE_AS_CURRENT, PET_SAVE_LAST_STABLE_SLOT); if (!result) { return status; }