From 3bc1da0a559c040c2986a760912b4c258badff07 Mon Sep 17 00:00:00 2001 From: sanctum32 Date: Mon, 18 Nov 2013 08:21:49 +0200 Subject: [PATCH] Revert "[12734] damn" This reverts commit e2dfb17b72f8d3369e5b3a234e8df3b35a92afc9. --- src/game/PetHandler.cpp | 6 +++--- src/shared/revision_nr.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp index 9bd33951c..3121030ee 100644 --- a/src/game/PetHandler.cpp +++ b/src/game/PetHandler.cpp @@ -802,7 +802,7 @@ void WorldSession::HandleSetPetSlotOpcode(WorldPacket& recv_data) int32 destId = 0; - if (result = CharacterDatabase.PQuery("SELECT id, entry FROM character_pet WHERE owner = '%u' AND slot = '%u'", _player->GetGUIDLow(), petNumber)) + if (result = CharacterDatabase.PQuery("SELECT id, entry FROM character_pet WHERE owner = '%u' AND actual_slot = '%u'", _player->GetGUIDLow(), petNumber)) { destId = (*result)[0].GetUInt32(); @@ -840,9 +840,9 @@ void WorldSession::HandleSetPetSlotOpcode(WorldPacket& recv_data) CharacterDatabase.BeginTransaction(); - CharacterDatabase.PExecute("UPDATE `character_pet` SET `slot` = '%u', `slot` = '%u' WHERE `id` = '%u'", newSlot, newSlot, srcId); + CharacterDatabase.PExecute("UPDATE `character_pet` SET `slot` = '%u', `actual_slot` = '%u' WHERE `id` = '%u'", newSlot, newSlot, srcId); if (destId) - CharacterDatabase.PExecute("UPDATE `character_pet` SET `slot` = '%u', `slot` = '%u' WHERE `id` = '%u'", slot, slot, destId); + CharacterDatabase.PExecute("UPDATE `character_pet` SET `slot` = '%u', `actual_slot` = '%u' WHERE `id` = '%u'", slot, slot, destId); CharacterDatabase.CommitTransaction(); SendStableResult(newSlot < PET_SAVE_FIRST_STABLE_SLOT ? STABLE_SUCCESS_STABLE : STABLE_SUCCESS_UNSTABLE); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b3e4dd748..652198ab9 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "12734" + #define REVISION_NR "12735" #endif // __REVISION_NR_H__