From 1fc4a1676d084b4be0866f0d3524d4e00bec34a1 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 3 Feb 2018 19:42:42 +1100 Subject: [PATCH] opcode update, cleanup and maybe disconnect issue fixed? it works on my machine:tm: --- src/common/Network/PacketDef/Ipcs.h | 2 +- .../sapphire_zone/DebugCommand/DebugCommandHandler.cpp | 9 --------- src/servers/sapphire_zone/ServerZone.cpp | 2 +- 3 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/common/Network/PacketDef/Ipcs.h b/src/common/Network/PacketDef/Ipcs.h index e2fc190d..05f8d7c3 100644 --- a/src/common/Network/PacketDef/Ipcs.h +++ b/src/common/Network/PacketDef/Ipcs.h @@ -141,7 +141,7 @@ namespace Packets { PlayerTitleList = 0x01EB, // updated 4.2 Discovery = 0x01EC, // updated 4.2 - EorzeaTimeOffset = 0x01C0, // updated 4.1 + EorzeaTimeOffset = 0x01EE, // updated 4.2 EquipDisplayFlags = 0x01FA, // updated 4.2 diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp index 96ac74c9..121c9a25 100644 --- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp +++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp @@ -702,15 +702,6 @@ void Core::DebugCommandHandler::script( char* data, Entity::Player &player, boos player.sendDebug( "Queued script reload for script: " + params ); } } - else if( subCommand == "build" || subCommand == "b" ) - { - if( subCommand == params ) - player.sendDebug( "Command failed: requires name of cmake target" ); - else - { - - } - } else { player.sendDebug( "Unknown script subcommand: " + subCommand ); diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp index c4d67dd7..ee723654 100644 --- a/src/servers/sapphire_zone/ServerZone.cpp +++ b/src/servers/sapphire_zone/ServerZone.cpp @@ -282,7 +282,7 @@ void Core::ServerZone::mainLoop() auto it = this->m_sessionMapById.begin(); for( ; it != this->m_sessionMapById.end(); ) { - int64_t diff = currTime - it->second->getLastDataTime(); + auto diff = std::difftime( currTime, it->second->getLastDataTime() ); auto pPlayer = it->second->getPlayer();