diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index 8ebca6f9..3b77195f 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -66,7 +66,7 @@ struct FFXIVIpcEventHandlerReturn : FFXIVIpcBasePacket< ReturnEventHandler > /* 000A */ char pad_000A[2]; /* 000C */ uint16_t param3; /* 000E */ char pad_000E[2]; - /* 0010 */ uint16_t tradeQuantity; + /* 0010 */ uint16_t param4; }; struct FFXIVIpcEnterTerritoryHandler : FFXIVIpcBasePacket< EnterTeriEventHandler > diff --git a/src/servers/Scripts/common/GilShop.cpp b/src/servers/Scripts/common/GilShop.cpp index bcf67844..f496074d 100644 --- a/src/servers/Scripts/common/GilShop.cpp +++ b/src/servers/Scripts/common/GilShop.cpp @@ -16,7 +16,7 @@ public: { //player.playGilShop( result.eventId, HIDE_HOTBAR | NO_DEFAULT_CAMERA, shopInteractionCallback ); - player.sendDebug("got tradeQuantity: " + std::to_string( result.tradeQuantity ) ); + player.sendDebug("got tradeQuantity: " + std::to_string( result.param4 ) ); player.playScene( result.eventId, 10, SCENE_FLAGS, 0, 0, shopInteractionCallback ); return; } diff --git a/src/servers/sapphire_zone/Event/EventHandler.h b/src/servers/sapphire_zone/Event/EventHandler.h index c6e94105..8821d6c5 100644 --- a/src/servers/sapphire_zone/Event/EventHandler.h +++ b/src/servers/sapphire_zone/Event/EventHandler.h @@ -12,7 +12,7 @@ namespace Core { uint16_t param1; uint16_t param2; uint16_t param3; - uint16_t tradeQuantity; + uint16_t param4; }; class EventHandler diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp index 27a165bd..69d2dd57 100644 --- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp @@ -203,7 +203,7 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_ const auto& param1 = packet.data().param1; const auto& param2 = packet.data().param2; const auto& param3 = packet.data().param3; - const auto& tradeQuantity = packet.data().tradeQuantity; + const auto& param4 = packet.data().param4; std::string eventName = Event::getEventName( eventId ); @@ -229,7 +229,7 @@ void Core::Network::GameConnection::eventHandlerReturn( const Packets::FFXIVARR_ result.param1 = param1; result.param2 = param2; result.param3 = param3; - result.tradeQuantity = tradeQuantity; + result.param4 = param4; eventCallback( player, result ); } // we might have a scene chain callback instead so check for that too