diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index f1a023fc..ca042e79 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -376,7 +376,7 @@ namespace Sapphire::Network::Packets PerformNoteHandler = 0x029B, // updated 4.3 - MapInteractionHandler = 0x0285, // updated 5.25 + WorldInteractionHandler = 0x0285, // updated 5.25 ShopMessage = 0x00C1, // updated 5.25 LootMessage = 0x00B1, // updated 5.25 }; diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index 6944cf39..42d48775 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -344,8 +344,8 @@ struct FFXIVIpcFreeCompanyUpdateShortMessageHandler : uint16_t unknown2; }; -struct FFXIVIpcMapInteractionHandler : - FFXIVIpcBasePacket< MapInteractionHandler > +struct FFXIVIpcWorldInteractionHandler : + FFXIVIpcBasePacket< WorldInteractionHandler > { uint32_t action; uint32_t unknown2; diff --git a/src/world/Network/GameConnection.cpp b/src/world/Network/GameConnection.cpp index d74635dc..091a7452 100644 --- a/src/world/Network/GameConnection.cpp +++ b/src/world/Network/GameConnection.cpp @@ -130,7 +130,7 @@ Sapphire::Network::GameConnection::GameConnection( Sapphire::Network::HivePtr pH setZoneHandler( ClientZoneIpcType::MarketBoardRequestItemListings, "MarketBoardRequestItemListings", &GameConnection::marketBoardRequestItemListings ); - setZoneHandler( ClientZoneIpcType::MapInteractionHandler, "MapInteractionHandler", &GameConnection::eventHandlerMapInteraction ); + setZoneHandler( ClientZoneIpcType::WorldInteractionHandler, "WorldInteractionHandler", &GameConnection::eventHandlerWorldInteraction ); setChatHandler( ClientChatIpcType::TellReq, "TellReq", &GameConnection::tellHandler ); diff --git a/src/world/Network/GameConnection.h b/src/world/Network/GameConnection.h index e175bca5..aa7c6a79 100644 --- a/src/world/Network/GameConnection.h +++ b/src/world/Network/GameConnection.h @@ -143,7 +143,7 @@ namespace Sapphire::Network DECLARE_HANDLER( eventHandlerShop ); - DECLARE_HANDLER( eventHandlerMapInteraction ); + DECLARE_HANDLER( eventHandlerWorldInteraction ); DECLARE_HANDLER( eventHandlerLinkshell ); diff --git a/src/world/Network/Handlers/EventHandlers.cpp b/src/world/Network/Handlers/EventHandlers.cpp index 43b47e02..fab33568 100644 --- a/src/world/Network/Handlers/EventHandlers.cpp +++ b/src/world/Network/Handlers/EventHandlers.cpp @@ -276,12 +276,12 @@ void Sapphire::Network::GameConnection::eventHandlerShop( const Packets::FFXIVAR scriptMgr.onTalk( player, player.getId(), eventId ); } -void Sapphire::Network::GameConnection::eventHandlerMapInteraction( const Packets::FFXIVARR_PACKET_RAW& inPacket, +void Sapphire::Network::GameConnection::eventHandlerWorldInteraction( const Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { - const auto packet = ZoneChannelPacket< Client::FFXIVIpcMapInteractionHandler >( inPacket ); + const auto packet = ZoneChannelPacket< Client::FFXIVIpcWorldInteractionHandler >( inPacket ); auto action = packet.data().action; - player.sendDebug( "MapInteraction {}", action ); + player.sendDebug( "WorldInteraction {}", action ); if( action == 0xD4 && player.getRace() == 3 ) // enter dwarf house lalafell only of course { // looks like shit but IT WORKS.