diff --git a/src/world/Action/ItemAction.cpp b/src/world/Action/ItemAction.cpp index aeb5100a..1712672b 100644 --- a/src/world/Action/ItemAction.cpp +++ b/src/world/Action/ItemAction.cpp @@ -93,9 +93,8 @@ void ItemAction::handleCompanionItem() { auto player = getSourceChara()->getAsPlayer(); - Logger::debug( "Companion arg: {0}", m_itemAction->data().Calcu0Arg[ 0 ] ); - player->unlockCompanion( m_itemAction->data().Calcu0Arg[ 0 ] ); + player->dropInventoryItem( static_cast< Common::InventoryType >( m_itemSourceContainer ), m_itemSourceSlot ); } void ItemAction::handleMountItem() @@ -103,5 +102,5 @@ void ItemAction::handleMountItem() auto player = getSourceChara()->getAsPlayer(); player->unlockMount( m_itemAction->data().Calcu0Arg[ 0 ] ); - player->discardItem( m_itemSourceContainer, m_itemSourceSlot ); + player->dropInventoryItem( static_cast< Common::InventoryType >( m_itemSourceContainer ), m_itemSourceSlot ); } \ No newline at end of file diff --git a/src/world/Network/Handlers/ActionHandler.cpp b/src/world/Network/Handlers/ActionHandler.cpp index cc573787..f25760cc 100644 --- a/src/world/Network/Handlers/ActionHandler.cpp +++ b/src/world/Network/Handlers/ActionHandler.cpp @@ -25,8 +25,8 @@ void Sapphire::Network::GameConnection::actionRequest( const Packets::FFXIVARR_P const auto actionId = packet.data().ActionKey; const auto sequence = packet.data().RequestId; const auto targetId = packet.data().Target; - const auto itemSourceSlot = packet.data().Arg & 0xFFFF0000; - const auto itemSourceContainer = packet.data().Arg & 0x0000FFFF; + const auto itemSourceSlot = packet.data().Arg & 0x0000FFFF; + const auto itemSourceContainer = packet.data().Arg & 0xFFFF0000; PlayerMgr::sendDebug( player, "Skill type: {0}, sequence: {1}, actionId: {2}, targetId: {3}", type, sequence, actionId, targetId );