From c864ecf2d2fb65216a1ddfa68d55143e849887c7 Mon Sep 17 00:00:00 2001
From: Mordred <ffxivsapphire@gmail.com>
Date: Fri, 2 Feb 2018 17:37:51 +0100
Subject: [PATCH] Changed more timer usages to 64bit, changed getQuestInfo exd
 to grab correct field for name

---
 .../sapphire_zone/Event/EventHelper.cpp        |  2 +-
 src/servers/sapphire_zone/Session.cpp          | 18 +++++++-----------
 src/servers/sapphire_zone/Session.h            |  4 ++--
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 018474d2..93f19343 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -21,7 +21,7 @@ std::string Core::Event::getEventName( uint32_t eventId )
       if( !questInfo )
          return unknown + "Quest";
 
-      std::string name = questInfo->name;
+      std::string name = questInfo->id;
       std::size_t pos = name.find_first_of( "_" );
 
       return questInfo->name.substr( 0, pos );
diff --git a/src/servers/sapphire_zone/Session.cpp b/src/servers/sapphire_zone/Session.cpp
index cb86ce4c..92d19d94 100644
--- a/src/servers/sapphire_zone/Session.cpp
+++ b/src/servers/sapphire_zone/Session.cpp
@@ -11,16 +11,12 @@
 
 extern Core::Logger g_log;
 
-Core::Session::Session( uint32_t sessionId )
-   : m_sessionId( sessionId )
-   , m_lastDataTime( static_cast< uint32_t >( Util::getTimeSeconds() ) )
-   , m_lastSqlTime( static_cast< uint32_t >( Util::getTimeSeconds() ) )
-   , m_isValid( false )
+Core::Session::Session( uint32_t sessionId ) :
+   m_sessionId( sessionId ),
+   m_lastDataTime( Util::getTimeSeconds() ),
+   m_lastSqlTime( Util::getTimeSeconds() ),
+   m_isValid( false )
 {
-
-   //   boost::posix_time::ptime now = boost::date_time::not_a_date_time;
-   //   now = boost::posix_time::microsec_clock::universal_time();
-
 }
 
 Core::Session::~Session()
@@ -91,7 +87,7 @@ int64_t Core::Session::getLastDataTime() const
    return m_lastDataTime;
 }
 
-uint32_t Core::Session::getLastSqlTime() const
+int64_t Core::Session::getLastSqlTime() const
 {
    return m_lastSqlTime;
 }
@@ -108,7 +104,7 @@ void Core::Session::updateLastDataTime()
 
 void Core::Session::updateLastSqlTime()
 {
-   m_lastSqlTime = static_cast< uint32_t >( Util::getTimeSeconds() );
+   m_lastSqlTime = Util::getTimeSeconds();
 }
 
 void Core::Session::startReplay( const std::string& path )
diff --git a/src/servers/sapphire_zone/Session.h b/src/servers/sapphire_zone/Session.h
index d879f129..33269b67 100644
--- a/src/servers/sapphire_zone/Session.h
+++ b/src/servers/sapphire_zone/Session.h
@@ -21,7 +21,7 @@ namespace Core {
       Network::GameConnectionPtr getChatConnection() const;
 
       int64_t getLastDataTime() const;
-      uint32_t getLastSqlTime() const;
+      int64_t getLastSqlTime() const;
 
       void updateLastDataTime();
       void updateLastSqlTime();
@@ -50,7 +50,7 @@ namespace Core {
 
       int64_t m_lastDataTime;
 
-      uint32_t m_lastSqlTime;
+      int64_t m_lastSqlTime;
       bool m_isValid;
 
       bool m_isReplaying;