mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-29 23:57:46 +00:00
Code Activity

Renamed GamePacketNew... finally

Browse source
This commit is contained in:
mordred 2019-03-08 15:34:38 +01:00
parent 5f34cb0a06
commit bfa6f74501
40 changed files with 44 additions and 381 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

336
src/common/Network/GamePacketNew.h
View file

@ -1,336 +0,0 @@
#ifndef _GAMEPACKET_NEW_H
#define _GAMEPACKET_NEW_H
#include <stdint.h>
#include <iostream>
#include <sstream>
#include <time.h>
#include <string.h>
#include <memory>
#include <Util/Util.h>
#include "CommonNetwork.h"
#include "PacketDef/Ipcs.h"
namespace Sapphire::Network::Packets
{
// Must forward define these in order to enable the compiler to produce the
// correct template functions.
template< typename T, typename T1 >
class FFXIVIpcPacket;
template< class T >
using ZoneChannelPacket = FFXIVIpcPacket< T, ServerZoneIpcType >;
template< class T >
using ChatChannelPacket = FFXIVIpcPacket< T, ServerChatIpcType >;
template< class T >
using LobbyChannelPacket = FFXIVIpcPacket< T, ServerLobbyIpcType >;
template< class T, typename... Args >
std::shared_ptr< ZoneChannelPacket< T > > makeZonePacket( Args... args )
{
return std::make_shared< ZoneChannelPacket< T > >( args... );
}
template< class T, typename... Args >
std::shared_ptr< T > makeWrappedPacket( Args... args )
{
return std::make_shared< T >( args... );
}
template< class T, typename... Args >
std::shared_ptr< ChatChannelPacket< T > > makeChatPacket( Args... args )
{
return std::make_shared< ChatChannelPacket< T > >( args... );
}
template< class T, typename... Args >
std::shared_ptr< LobbyChannelPacket< T > > makeLobbyPacket( Args... args )
{
return std::make_shared< LobbyChannelPacket< T > >( args... );
}
/**
* The base implementation of a game packet. Needed for parsing packets.
*/
template< typename T1 >
class FFXIVIpcPacketBase
{
public:
virtual ~FFXIVIpcPacketBase() = default;
/**
* @brief Gets the IPC type of this packet. (Useful for determining the
* type of a parsed packet.)
*/
virtual T1 ipcType() = 0;
};
////////////////////////////////////////////////7
class FFXIVPacketBase
{
public:
FFXIVPacketBase() :
m_segmentType( 0 )
{
initializeSegmentHeader();
}
FFXIVPacketBase( uint16_t segmentType, uint32_t sourceActorId, uint32_t targetActorId ) :
m_segmentType( segmentType )
{
initializeSegmentHeader();
setSourceActor( sourceActorId );
setTargetActor( targetActorId );
}
std::size_t getSize() const
{
return m_segHdr.size;
}
virtual std::vector< uint8_t > getData() const
{
return {};
}
protected:
/** The segment header */
FFXIVARR_PACKET_SEGMENT_HEADER m_segHdr;
uint16_t m_segmentType;
public:
virtual size_t getContentSize()
{
return 0;
};
virtual std::vector< uint8_t > getContent()
{
return {};
};
/**
* @brief Gets the segment type of this packet.
*/
uint16_t getSegmentType() const
{
return m_segmentType;
}
/**
* @brief Sets the source actor id for this packet.
* @param actorId The source actor id.
*/
void setSourceActor( uint32_t actorId )
{
m_segHdr.source_actor = actorId;
};
/**
* @brief Gets the source actor id for this packet.
* @return The source actor id.
*/
uint32_t getSourceActor() const
{
return m_segHdr.source_actor;
};
/**
* @brief Sets the target actor id for this packet.
* @param actorId The target actor id.
*/
void setTargetActor( uint32_t actorId )
{
m_segHdr.target_actor = actorId;
};
/**
* @brief Gets the target actor id for this packet.
*/
uint32_t getTargetActor( void ) const
{
return m_segHdr.target_actor;
};
/** Initializes the fields of the segment header structure */
virtual void initializeSegmentHeader( void )
{
// Zero out the structure.
memset( &m_segHdr, 0, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
// Set the values of static fields.
// The size must be the sum of the segment header and the content
m_segHdr.size = static_cast< uint32_t >( sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + getContentSize() );
m_segHdr.type = getSegmentType();
}
};
template< typename T, typename T1 >
class FFXIVIpcPacket :
public FFXIVIpcPacketBase< T1 >, public FFXIVPacketBase
{
public:
FFXIVIpcPacket< T, T1 >( uint32_t sourceActorId, uint32_t targetActorId ) :
FFXIVPacketBase( 3, sourceActorId, targetActorId )
{
initialize();
};
FFXIVIpcPacket< T, T1 >( uint32_t sourceActorId ) :
FFXIVPacketBase( 3, sourceActorId, sourceActorId )
{
initialize();
};
FFXIVIpcPacket< T, T1 >( const FFXIVARR_PACKET_RAW& rawPacket )
{
auto ipcHdrSize = sizeof( FFXIVARR_IPC_HEADER );
auto copySize = std::min< size_t >( sizeof( T ), rawPacket.segHdr.size - ipcHdrSize );
memcpy( &m_segHdr, &rawPacket.segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
memcpy( &m_data, &rawPacket.data[ 0 ] + ipcHdrSize, copySize );
memset( &m_ipcHdr, 0, ipcHdrSize );
m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
}
size_t getContentSize() override
{
return sizeof( FFXIVARR_IPC_HEADER ) + sizeof( T );
}
std::vector< uint8_t > getContent() override
{
std::vector< uint8_t > content( getContentSize() );
memcpy( content.data(), &m_ipcHdr, sizeof( FFXIVARR_IPC_HEADER ) );
memcpy( content.data() + sizeof( FFXIVARR_IPC_HEADER ), &m_data, sizeof( T ) );
return content;
}
std::vector< uint8_t > getData() const override
{
auto segmentHeaderSize = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
auto ipcHeaderSize = sizeof( FFXIVARR_IPC_HEADER );
auto dataSize = sizeof( m_data );
std::vector< uint8_t > data( segmentHeaderSize + ipcHeaderSize + dataSize );
memcpy( &data[ 0 ], &m_segHdr, segmentHeaderSize );
memcpy( &data[ segmentHeaderSize ], &m_ipcHdr, ipcHeaderSize );
memcpy( &data[ segmentHeaderSize + ipcHeaderSize ], &m_data, dataSize );
return data;
}
T1 ipcType() override
{
return static_cast< T1 >( m_data._ServerIpcType );
};
/** Gets a reference to the underlying IPC data structure. */
T& data()
{
return m_data;
};
const T& data() const
{
return m_data;
}
protected:
/** Initializes the fields of the header structures */
virtual void initialize()
{
// Zero out the structures.
memset( &m_ipcHdr, 0, sizeof( FFXIVARR_IPC_HEADER ) );
memset( &m_data, 0, sizeof( T ) );
// The IPC type itself.
m_ipcHdr.type = static_cast< ServerZoneIpcType >( m_data._ServerIpcType );
m_ipcHdr.timestamp = Util::getTimeSeconds();
m_segHdr.size = sizeof( T ) + sizeof( FFXIVARR_IPC_HEADER ) + sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
};
protected:
/** The IPC packet header */
FFXIVARR_IPC_HEADER m_ipcHdr;
/** The underlying data portion of the packet as a structure */
T m_data;
};
class FFXIVRawPacket :
public FFXIVPacketBase
{
public:
FFXIVRawPacket( uint16_t type, uint32_t size, uint32_t sourceActorId, uint32_t targetActorId ) :
m_data( std::vector< uint8_t >( size - sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) ) ),
FFXIVPacketBase( type, sourceActorId, targetActorId )
{
initialize();
m_segHdr.size = size;
};
FFXIVRawPacket( char* data, uint16_t size ) :
m_data( std::vector< uint8_t >( size ) )
{
auto segmentHdrSize = sizeof( FFXIVARR_PACKET_SEGMENT_HEADER );
memcpy( &m_data[ 0 ], data + segmentHdrSize, size - segmentHdrSize );
memcpy( &m_segHdr, data, segmentHdrSize );
}
size_t getContentSize() override
{
return m_data.size();
}
std::vector< uint8_t > getContent() override
{
return m_data;
}
virtual std::vector< uint8_t > getData() const override
{
std::vector< uint8_t > data( sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) + m_data.size() );
memcpy( &data[ 0 ], &m_segHdr, sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) );
memcpy( &data[ sizeof( FFXIVARR_PACKET_SEGMENT_HEADER ) ], &m_data[ 0 ], m_data.size() );
return data;
}
/** Gets a reference to the underlying IPC data structure. */
std::vector< uint8_t >& data()
{
return m_data;
};
protected:
/** Initializes the fields of the header structures */
virtual void initialize()
{
// Zero out the structures.
memset( &m_data[ 0 ], 0, m_data.size() );
};
protected:
/** The underlying data portion of the packet as a structure */
std::vector< uint8_t > m_data;
};
}
#endif /*_CORE_NETWORK_PACKETS_CGAMEPACKETNEW_H*/

2
src/common/Network/PacketContainer.h
View file

@ -5,7 +5,7 @@
#include "Common.h"
#include "CommonNetwork.h"
#include "GamePacketNew.h"
#include "GamePacket.h"
#include "Forwards.h"
namespace Sapphire::Network::Packets

2
src/lobby/GameConnection.cpp
View file

@ -4,7 +4,7 @@
#include <Network/CommonNetwork.h>
#include <Util/Util.h>
#include <Logging/Logger.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Lobby/ServerLobbyDef.h>
#include <Network/GamePacketParser.h>
#include <Crypt/md5.h>

2
src/lobby/LobbyPacketContainer.cpp
View file

@ -1,6 +1,6 @@
#include "LobbyPacketContainer.h"
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Crypt/blowfish.h>
#include <Common.h>

1
src/world/Actor/EventObject.cpp
View file

@ -8,7 +8,6 @@
#include "Network/PacketWrappers/ActorControlPacket144.h"
#include <Logging/Logger.h>
#include <Network/GamePacketNew.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/CommonActorControl.h>
#include <Util/UtilMath.h>

2
src/world/Manager/DebugCommandMgr.cpp
View file

@ -2,7 +2,7 @@
#include <Common.h>
#include <Version.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Util/Util.h>
#include <Util/UtilMath.h>
#include <Network/PacketContainer.h>

4
src/world/Manager/InventoryMgr.cpp
View file

@ -6,7 +6,7 @@
#include "Inventory/HousingItem.h"
#include "Manager/ItemMgr.h"
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Database/DatabaseDef.h>
#include <Exd/ExdDataGenerated.h>
@ -184,4 +184,4 @@ void Sapphire::World::Manager::InventoryMgr::saveItem( Sapphire::Entity::Player&
stmt->setUInt( 4, item->getStackSize() );
pDb->directExecute( stmt );
}
}

4
src/world/Manager/MarketMgr.cpp
View file

@ -5,7 +5,7 @@
#include <Logging/Logger.h>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Actor/Player.h"
@ -155,4 +155,4 @@ void Sapphire::World::Manager::MarketMgr::findItems( const std::string_view& sea
resultList.push_back( { item.catalogId, 1 } );
}
}
}

2
src/world/Network/Handlers/ActionHandler.cpp
View file

@ -1,6 +1,6 @@
#include <Common.h>
#include <Exd/ExdDataGenerated.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ClientZoneDef.h>
#include <Logging/Logger.h>

2
src/world/Network/Handlers/CFHandlers.cpp
View file

@ -1,6 +1,6 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Logging/Logger.h>
#include <Network/PacketContainer.h>
#include <Exd/ExdDataGenerated.h>

2
src/world/Network/Handlers/ClientTriggerHandler.cpp
View file

@ -1,6 +1,6 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Logging/Logger.h>
#include <Exd/ExdDataGenerated.h>
#include <Network/PacketContainer.h>

2
src/world/Network/Handlers/EventHandlers.cpp
View file

@ -2,7 +2,7 @@
#include <Logging/Logger.h>
#include <Exd/ExdDataGenerated.h>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketContainer.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/PacketDef/Zone/ClientZoneDef.h>

2
src/world/Network/Handlers/GMCommandHandlers.cpp
View file

@ -1,6 +1,6 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Logging/Logger.h>
#include <Network/PacketContainer.h>
#include <Network/CommonActorControl.h>

2
src/world/Network/Handlers/InventoryHandler.cpp
View file

@ -1,6 +1,6 @@
#include <Common.h>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Logging/Logger.h>
#include <Network/PacketContainer.h>
#include <Network/PacketDef/Zone/ClientZoneDef.h>

4
src/world/Network/Handlers/PacketHandlers.cpp
View file

@ -1,7 +1,7 @@
#include <Common.h>
#include <Vector3.cpp>
#include <Network/CommonNetwork.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/CommonActorControl.h>
#include <Logging/Logger.h>
#include <Network/PacketContainer.h>
@ -747,4 +747,4 @@ void Sapphire::Network::GameConnection::marketBoardRequestItemListings( Framewor
auto marketMgr = pFw->get< MarketMgr >();
marketMgr->requestItemListings( player, packet.data().itemCatalogId );
}
}

2
src/world/Network/PacketWrappers/ActorControlPacket142.h
View file

@ -1,7 +1,7 @@
#ifndef _ACTORCONTROL142_H
#define _ACTORCONTROL142_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Forwards.h"

2
src/world/Network/PacketWrappers/ActorControlPacket143.h
View file

@ -1,7 +1,7 @@
#ifndef _ACTORCONTROL143_H
#define _ACTORCONTROL143_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Forwards.h"

2
src/world/Network/PacketWrappers/ActorControlPacket144.h
View file

@ -1,7 +1,7 @@
#ifndef _ACTORCONTROL144_H
#define _ACTORCONTROL144_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
namespace Sapphire::Network::Packets::Server

2
src/world/Network/PacketWrappers/ChatPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _CHATPACKET_H
#define _CHATPACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Forwards.h"

2
src/world/Network/PacketWrappers/DirectorPlayScenePacket.h
View file

@ -1,7 +1,7 @@
#ifndef _DIRECTORPLAYSCENE_H
#define _DIRECTORPLAYSCENE_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Forwards.h"
namespace Sapphire::Network::Packets::Server

2
src/world/Network/PacketWrappers/EffectPacket.h
View file

@ -1,7 +1,7 @@
#ifndef SAPPHIRE_EFFECTPACKET_H
#define SAPPHIRE_EFFECTPACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Forwards.h"
#include <string>

2
src/world/Network/PacketWrappers/EventFinishPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _EVENTFINISH_H
#define _EVENTFINISH_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
namespace Sapphire::Network::Packets::Server
{

2
src/world/Network/PacketWrappers/EventPlayPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _EVENTPLAY_H
#define _EVENTPLAY_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Forwards.h"
namespace Sapphire::Network::Packets::Server

2
src/world/Network/PacketWrappers/EventStartPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _EVENTSTART_H
#define _EVENTSTART_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Forwards.h"
namespace Sapphire::Network::Packets::Server

2
src/world/Network/PacketWrappers/ExaminePacket.h
View file

@ -2,7 +2,7 @@
#define _CORE_NETWORK_PACKETS_EXAMINEPACKET_H
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Util/Util.h>
#include "Actor/Player.h"
#include "Forwards.h"

2
src/world/Network/PacketWrappers/InitUIPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _CORE_NETWORK_PACKETS_INITUIPACKET_H
#define _CORE_NETWORK_PACKETS_INITUIPACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Actor/Player.h"
#include "Forwards.h"

2
src/world/Network/PacketWrappers/ModelEquipPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _MODELEQUIPPACKET_H
#define _MODELEQUIPPACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Actor/Player.h"
#include "Forwards.h"

2
src/world/Network/PacketWrappers/MoveActorPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _MOVEACTORPACKET_H
#define _MOVEACTORPACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Util/UtilMath.h>
#include "Actor/Player.h"

2
src/world/Network/PacketWrappers/NpcSpawnPacket.h
View file

@ -2,7 +2,7 @@
#define _PLAYERSPAWN_H
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Util/Util.h>
#include <Common.h>
#include "Actor/Player.h"

2
src/world/Network/PacketWrappers/PingPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _CORE_NETWORK_PACKETS_PINGPACKET_H
#define _CORE_NETWORK_PACKETS_PINGPACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Forwards.h"

2
src/world/Network/PacketWrappers/PlayerSpawnPacket.h
View file

@ -2,7 +2,7 @@
#define _PLAYERSPAWN_H
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Util/Util.h>
#include "Actor/Player.h"
#include "Forwards.h"

2
src/world/Network/PacketWrappers/PlayerStateFlagsPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _PLAYERSTATE_H
#define _PLAYERSTATE_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Actor/Player.h"
#include "Forwards.h"

2
src/world/Network/PacketWrappers/QuestMessagePacket.h
View file

@ -1,7 +1,7 @@
#ifndef _QUESTMESSAGE_H
#define _QUESTMESSAGE_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Actor/Player.h"
#include "Forwards.h"

2
src/world/Network/PacketWrappers/ServerNoticePacket.h
View file

@ -1,7 +1,7 @@
#ifndef _SERVERNOTICEPACKET_H
#define _SERVERNOTICEPACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Forwards.h"

2
src/world/Network/PacketWrappers/UpdateHpMpTpPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _UPDATEHPMPTP_H
#define _UPDATEHPMPTP_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Actor/Chara.h>
#include "Forwards.h"

2
src/world/Network/PacketWrappers/UpdateInventorySlotPacket.h
View file

@ -1,7 +1,7 @@
#ifndef _INVENTORY_SLOT_UPDATE_PACKET_H
#define _INVENTORY_SLOT_UPDATE_PACKET_H
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include "Actor/Player.h"
#include "Inventory/Item.h"
#include "Forwards.h"

4
src/world/Territory/Housing/HousingInteriorTerritory.cpp
View file

@ -4,7 +4,7 @@
#include <Util/UtilMath.h>
#include <Database/DatabaseDef.h>
#include <Exd/ExdDataGenerated.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/CommonActorControl.h>
@ -234,4 +234,4 @@ void Sapphire::World::Territory::Housing::HousingInteriorTerritory::removeHousin
player.second->queuePacket( pkt );
}
}
}

4
src/world/Territory/HousingZone.cpp
View file

@ -4,7 +4,7 @@
#include <Util/UtilMath.h>
#include <Database/DatabaseDef.h>
#include <Exd/ExdDataGenerated.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include <Network/PacketWrappers/ActorControlPacket143.h>
#include <Network/CommonActorControl.h>
@ -419,4 +419,4 @@ void Sapphire::HousingZone::despawnYardObject( uint16_t landId, uint16_t slot )
player.second->queuePacket( pkt );
}
}
}

4
src/world/Territory/Land.cpp
View file

@ -10,7 +10,7 @@
#include <MySqlBase.h>
#include <Connection.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>
#include "Actor/Player.h"
@ -241,4 +241,4 @@ void Sapphire::Land::update( uint32_t currTime )
Sapphire::Land::InvMaxItemsPair Sapphire::Land::getInventoryItemMax() const
{
return std::make_pair( m_maxPlacedExternalItems, m_maxPlacedInternalItems );
}
}

2
src/world/Territory/Zone.cpp
View file

@ -6,7 +6,7 @@
#include <Logging/Logger.h>
#include <Util/Util.h>
#include <Util/UtilMath.h>
#include <Network/GamePacketNew.h>
#include <Network/GamePacket.h>
#include <Exd/ExdDataGenerated.h>
#include <Network/CommonNetwork.h>
#include <Network/PacketDef/Zone/ServerZoneDef.h>