diff options
| -rw-r--r-- | sql/updates/characters/2012_07_30_01_characters_void_storage_434.sql (renamed from sql/updates/characters/2012_07_30_01_world_void_storage_434.sql) | 0 | ||||
| -rwxr-xr-x | src/server/game/Entities/Player/Player.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Handlers/VoidStorageHandler.cpp | 6 |
3 files changed, 3 insertions, 7 deletions
diff --git a/sql/updates/characters/2012_07_30_01_world_void_storage_434.sql b/sql/updates/characters/2012_07_30_01_characters_void_storage_434.sql index cd2cb0f0b9e..cd2cb0f0b9e 100644 --- a/sql/updates/characters/2012_07_30_01_world_void_storage_434.sql +++ b/sql/updates/characters/2012_07_30_01_characters_void_storage_434.sql diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 19c61b7013d..f3375fb115e 100755 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -25757,12 +25757,8 @@ void Player::DeleteVoidStorageItem(uint8 slot) bool Player::SwapVoidStorageItem(uint8 oldSlot, uint8 newSlot) { if (oldSlot < 0 || oldSlot > VOID_STORAGE_MAX_SLOT || newSlot < 0 || newSlot > VOID_STORAGE_MAX_SLOT || oldSlot == newSlot) - { - return false; - } - // verify std::swap(_voidStorageItems[newSlot], _voidStorageItems[oldSlot]); return true; } diff --git a/src/server/game/Handlers/VoidStorageHandler.cpp b/src/server/game/Handlers/VoidStorageHandler.cpp index cc89bddb289..3938def0cc7 100644 --- a/src/server/game/Handlers/VoidStorageHandler.cpp +++ b/src/server/game/Handlers/VoidStorageHandler.cpp @@ -609,11 +609,11 @@ void WorldSession::HandleVoidSwapItem(WorldPacket& recvData) data.WriteByteSeq(itemId[7]); } - if (usedSrcSlot) - data << uint32(newSlot); - if (usedDestSlot) data << uint32(oldSlot); + if (usedSrcSlot) + data << uint32(newSlot); + SendPacket(&data); } |