mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-01 00:27:44 +00:00
Code Activity

Merge pull request #129 from itsMaru/master

Browse source 
Updating stuff for 4.1;
This commit is contained in:
Mordred 2017-10-10 23:39:13 +02:00 • committed by GitHub
commit 85feedf102
5 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/servers/Server_Common/Network/PacketDef/Chat/ServerChatDef.h
View file

@ -19,6 +19,8 @@ struct FFXIVIpcTell : FFXIVIpcBasePacket<Tell>
uint16_t u2a;
uint16_t u2b;
uint8_t preName;
uint8_t u3a;
uint8_t u3b;
char receipientName[32];
char msg[1031];
};

6
src/servers/Server_Common/Network/PacketDef/Ipcs.h
View file

@ -66,7 +66,7 @@ namespace Packets {
BlackList = 0x00D4, // updated 4.1
LogMessage = 0x00D0,
LinkshellList = 0x00D1,
StatusEffectList = 0x00F0,
StatusEffectList = 0x00FA,
Effect = 0x00F1,
GCAffiliation = 0x00FC,
@ -78,9 +78,9 @@ namespace Packets {
HateList = 0x011A,
UpdateClassInfo = 0x011D,
InitUI = 0x012B, // updated 4.1
PlayerStats = 0x012C, // updated 4.1
ActorOwner = 0x012D, // updated 4.1
PlayerStateFlags = 0x013A, // updated 4.1
PlayerStats = 0x0138, // updated 4.1
PlayerClassInfo = 0x013B, // updated 4.1
ModelEquip = 0x013C, // updated 4.1
ItemInfo = 0x014C, // updated 4.1
@ -115,7 +115,7 @@ namespace Packets {
ActorFreeSpawn = 0x0191, // unchanged for sb
InitZone = 0x019A, // unchanged for sb
WeatherChange = 0x01AF, // updated for sb
PlayerTitleList = 0x01B1, // updated for 4.06
PlayerTitleList = 0x01BD, // updated for 4.1
Discovery = 0x01B2, // updated for sb
EorzeaTimeOffset = 0x01B4,

10
src/servers/Server_Common/Network/PacketDef/Zone/ServerZoneDef.h
View file

@ -340,15 +340,15 @@ struct FFXIVIpcPlayerSpawn : FFXIVIpcBasePacket<PlayerSpawn>
{
uint16_t title;
uint16_t u1b;
uint8_t gmRank;
uint8_t u2ab;
uint8_t u2b;
uint8_t u2ab;
uint8_t gmRank;
uint8_t onlineStatus;
uint8_t pose;
uint8_t u3a;
uint8_t u3b;
uint8_t u3c;
uint8_t u3d;
uint8_t pose;
uint32_t u4;
@ -726,7 +726,7 @@ struct FFXIVIpcInitUI : FFXIVIpcBasePacket<InitUI>
uint16_t unknown_005;
uint8_t unknown_114;
uint8_t padding_114;
uint8_t unknown_1141[52];
uint8_t unknown_1141[61];
uint8_t preNamePadding;
char name[32];
uint8_t unknown_54[16];

6
src/servers/Server_Zone/Network/Handlers/ActionHandler.cpp
View file

@ -229,6 +229,10 @@ void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& in
}
break;
}
default:
{
g_log.debug( "[" + std::to_string( m_pSession->getId() ) + "] Unhandled action: " +
boost::str( boost::format( "%|04X|" ) % (uint32_t) ( commandId & 0xFFFF ) ) );
}
}
}

2
src/servers/Server_Zone/Network/PacketWrappers/PlayerSpawnPacket.h
View file

@ -48,6 +48,8 @@ namespace Server {
//m_data.tPMax = 3000;
m_data.level = pPlayer->getLevel();
m_data.gmRank = pPlayer->getGmRank();
m_data.pose = 0;
memcpy( m_data.look, pPlayer->getLookArray(), 26 );
auto item = pPlayer->getInventory()->getItemAt( Inventory::GearSet0, Inventory::EquipSlot::MainHand );