From 1235ce264bf33cf6f27b5aebcc2d498b42c10433 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 25 Feb 2018 15:16:42 +1100 Subject: [PATCH] more opcodes --- src/common/Network/PacketDef/Ipcs.h | 2 ++ .../sapphire_zone/Network/Handlers/ActionHandler.cpp | 3 +++ src/servers/sapphire_zone/Zone/TerritoryMgr.cpp | 6 +++--- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index a7892f9e..fc4a1da2 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -206,6 +206,8 @@ namespace Packets { FcInfoReqHandler = 0x011A, // updated 4.2 + + ReqJoinNoviceNetwork = 0x0129, // updated 4.2 ReqCountdownInitiate = 0x012C, // updated 4.2 ReqCountdownCancel = 0x012D, // updated 4.2 diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp index 00cc62d0..6915f69b 100644 --- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp +++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp @@ -73,6 +73,8 @@ enum ClientTrigger DyeItem = 0x1B5, + RequestChocoboInventory = 0x1C4, + Emote = 0x1F4, PersistantEmoteCancel = 0x1F7, PoseChange = 0x1F9, @@ -95,6 +97,7 @@ enum ClientTrigger CompanionSetBarding = 0x6A5, CompanionActionUnlock = 0x6A6, + OpenPerformInstrumentUI = 0x71C, }; void Core::Network::GameConnection::actionHandler( const Packets::GamePacket& inPacket, diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp index 18ae16c2..ed4c1513 100644 --- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp +++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp @@ -115,9 +115,9 @@ bool Core::TerritoryMgr::createDefaultTerritories() g_log.Log( LoggingSeverity::info, std::to_string( territoryId ) + "\t" + std::to_string( guid ) + "\t" + std::to_string( territoryInfo->territoryIntendedUse ) + - "\t" + territoryInfo->name + - "\t" + pPlaceName->name + - "\t" + ( isPrivateTerritory( territoryId ) ? "PRIVATE" : "PUBLIC" ) ); + "\t" + ( territoryInfo->name.length() <= 4 ? territoryInfo->name + "\t" : territoryInfo->name ) + + "\t" + ( isPrivateTerritory( territoryId ) ? "PRIVATE" : "PUBLIC" ) + + "\t" + pPlaceName->name ); auto pZone = make_Zone( territoryId, guid, territoryInfo->name, pPlaceName->name ); pZone->init();