mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 10:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "[12734] damn"

Browse source 
This reverts commit e2dfb17b72f8d3369e5b3a234e8df3b35a92afc9.
This commit is contained in:
sanctum32 2013-11-18 08:21:49 +02:00 • committed by Antz
parent 5371320880
commit 3bc1da0a55
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/PetHandler.cpp
View file

@ -802,7 +802,7 @@ void WorldSession::HandleSetPetSlotOpcode(WorldPacket& recv_data)
int32 destId = 0; 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(); destId = (*result)[0].GetUInt32();
@ -840,9 +840,9 @@ void WorldSession::HandleSetPetSlotOpcode(WorldPacket& recv_data)
CharacterDatabase.BeginTransaction(); 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) 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(); CharacterDatabase.CommitTransaction();
SendStableResult(newSlot < PET_SAVE_FIRST_STABLE_SLOT ? STABLE_SUCCESS_STABLE : STABLE_SUCCESS_UNSTABLE); SendStableResult(newSlot < PET_SAVE_FIRST_STABLE_SLOT ? STABLE_SUCCESS_STABLE : STABLE_SUCCESS_UNSTABLE);

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12734" #define REVISION_NR "12735"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__