From 289b01dbda482bdbac5bd4765cae1857ba47cca4 Mon Sep 17 00:00:00 2001 From: NotAdam Date: Mon, 14 Jan 2019 20:05:27 +1100 Subject: [PATCH] fix placing interior housing items --- src/common/Network/PacketDef/Zone/ServerZoneDef.h | 6 +----- src/world/Territory/Housing/HousingInteriorTerritory.cpp | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/common/Network/PacketDef/Zone/ServerZoneDef.h b/src/common/Network/PacketDef/Zone/ServerZoneDef.h index bcbbd11a..d4402fec 100644 --- a/src/common/Network/PacketDef/Zone/ServerZoneDef.h +++ b/src/common/Network/PacketDef/Zone/ServerZoneDef.h @@ -1726,11 +1726,7 @@ struct FFXIVIpcHousingInternalObjectSpawn : FFXIVIpcBasePacket< HousingInternalO uint8_t containerOffset; uint8_t pad1; - uint16_t itemId; - uint8_t unk2; - uint8_t pad2; - uint16_t rotation; - Common::FFXIVARR_POSITION3 pos; + Common::HousingObject object; }; struct FFXIVIpcHousingIndoorInitialize : FFXIVIpcBasePacket< HousingIndoorInitialize > diff --git a/src/world/Territory/Housing/HousingInteriorTerritory.cpp b/src/world/Territory/Housing/HousingInteriorTerritory.cpp index 98b7cc41..1121e268 100644 --- a/src/world/Territory/Housing/HousingInteriorTerritory.cpp +++ b/src/world/Territory/Housing/HousingInteriorTerritory.cpp @@ -186,9 +186,9 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::spawnHousing objectSpawnPkt->data().containerId = containerType; objectSpawnPkt->data().containerOffset = slot; - objectSpawnPkt->data().itemId = item->getAdditionalData() & 0xFFFF; - objectSpawnPkt->data().rotation = item->getRot(); - objectSpawnPkt->data().pos = item->getPos(); + objectSpawnPkt->data().object.itemId = item->getAdditionalData() & 0xFFFF; + objectSpawnPkt->data().object.rotation = item->getRot(); + objectSpawnPkt->data().object.pos = item->getPos(); player.second->queuePacket( objectSpawnPkt ); }