diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index 39ba1963..8b43346b 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -189,7 +189,7 @@ namespace Core::Network::Packets LandPriceUpdate = 0x0224, // updated 4.4 LandInfoSign = 0x0225, // updated 4.4 - RenameLand = 0x0226, // updated 4.4 + LandRename = 0x0226, // updated 4.4 LandPermissionSlot = 0x0228, // updated 4.4 @@ -296,7 +296,7 @@ namespace Core::Network::Packets LinkshellEventHandler = 0x0150, // updated 4.1 ?? LinkshellEventHandler1 = 0x0151, // updated 4.1 ?? - RenameLandHandler = 0x0171, // updated 4.4 + LandRenameHandler = 0x0171, // updated 4.4 SetSharedEstateSettings = 0x0177, // updated 4.4 diff --git a/src/common/Network/PacketDef/Zone/ClientZoneDef.h b/src/common/Network/PacketDef/Zone/ClientZoneDef.h index ac8ea9dc..7dae9236 100644 --- a/src/common/Network/PacketDef/Zone/ClientZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ClientZoneDef.h @@ -190,7 +190,7 @@ struct FFXIVIpcInventoryModifyHandler : }; struct FFXIVIpcRenameLandHandler : - FFXIVIpcBasePacket< RenameLandHandler > + FFXIVIpcBasePacket< LandRenameHandler > { /* 0000 */ uint16_t landId; /* 0002 */ uint16_t wardNum; diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index b0f29327..84ab8c5f 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1632,7 +1632,7 @@ struct FFXIVIpcLandInfoSign : FFXIVIpcBasePacket< LandInfoSign > uint8_t tag[3]; }; -struct FFXIVIpcRenameLand : FFXIVIpcBasePacket< RenameLand > +struct FFXIVIpcLandRename : FFXIVIpcBasePacket< LandRename > { uint16_t landId; uint16_t wardNum; diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp index d0cdecbc..5d412727 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.cpp +++ b/src/servers/sapphire_zone/Network/GameConnection.cpp @@ -84,7 +84,7 @@ Core::Network::GameConnection::GameConnection( Core::Network::HivePtr pHive, &GameConnection::inventoryModifyHandler ); setZoneHandler( ClientZoneIpcType::BuildPresetHandler, "BuildPresetHandler", &GameConnection::eventHandlerTalk ); - setZoneHandler( ClientZoneIpcType::RenameLandHandler, "RenameLandHandler", &GameConnection::renameLandHandler ); + setZoneHandler( ClientZoneIpcType::LandRenameHandler, "LandRenameHandler", &GameConnection::landRenameHandler ); setZoneHandler( ClientZoneIpcType::TalkEventHandler, "EventHandlerTalk", &GameConnection::eventHandlerTalk ); setZoneHandler( ClientZoneIpcType::EmoteEventHandler, "EventHandlerEmote", &GameConnection::eventHandlerEmote ); setZoneHandler( ClientZoneIpcType::WithinRangeEventHandler, "EventHandlerWithinRange", diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h index 61040c33..8ba31549 100644 --- a/src/servers/sapphire_zone/Network/GameConnection.h +++ b/src/servers/sapphire_zone/Network/GameConnection.h @@ -162,7 +162,7 @@ namespace Core::Network DECLARE_HANDLER( performNoteHandler ); - DECLARE_HANDLER( renameLandHandler ); + DECLARE_HANDLER( landRenameHandler ); DECLARE_HANDLER( buildPresetHandler ); diff --git a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp index e37f5763..f4b69960 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ClientTriggerHandler.cpp @@ -392,7 +392,7 @@ void Core::Network::GameConnection::clientTriggerHandler( const Packets::FFXIVAR } case ClientTriggerType::RequestHousingRename: { - auto landRenamePacket = makeZonePacket< Server::FFXIVIpcRenameLand >( player.getId() ); + auto landRenamePacket = makeZonePacket< Server::FFXIVIpcLandRename >( player.getId() ); uint8_t ward = ( param12 & 0xFF00 ) >> 8; uint8_t plot = ( param12 & 0xFF ); diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp index d3a69bfc..de2f34d5 100644 --- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp @@ -652,7 +652,7 @@ void Core::Network::GameConnection::performNoteHandler( const Core::Network::Pac player.sendToInRangeSet( performPacket ); } -void Core::Network::GameConnection::renameLandHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, +void Core::Network::GameConnection::landRenameHandler( const Core::Network::Packets::FFXIVARR_PACKET_RAW& inPacket, Entity::Player& player ) { const auto packet = ZoneChannelPacket< Client::FFXIVIpcRenameLandHandler >( inPacket );