From d7ea2afdaecb23bc57b5f40f58cc6aa7216e311f Mon Sep 17 00:00:00 2001 From: Eduardo Dantas Date: Thu, 18 Jan 2024 10:02:46 -0300 Subject: [PATCH] fix: revert items order with convergence fusion --- src/server/network/protocol/protocolgame.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/server/network/protocol/protocolgame.cpp b/src/server/network/protocol/protocolgame.cpp index 2c44faba957..99952852222 100644 --- a/src/server/network/protocol/protocolgame.cpp +++ b/src/server/network/protocol/protocolgame.cpp @@ -5217,7 +5217,12 @@ void ProtocolGame::sendForgeResult(ForgeAction_t actionType, uint16_t leftItemId msg.addByte(static_cast(actionType)); msg.addByte(convergence); - msg.addByte(convergence ? true : success); + if (convergence && actionType == ForgeAction_t::FUSION) { + success = true; + std::swap(leftItemId, rightItemId); + } + + msg.addByte(success); msg.add(leftItemId); msg.addByte(leftTier);