From a2e12667b4e072b203506ab90acc2390d5c39c36 Mon Sep 17 00:00:00 2001 From: Alex Date: Thu, 28 Jun 2018 13:25:50 -0700 Subject: [PATCH 1/2] Update README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 47b835788..e1126241c 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # EQEmulator Core Server -|Travis CI (Linux)|Appveyor (Windows) | -|:---:|:---:| -|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server) |[![Windows CI](https://ci.appveyor.com/api/projects/status/d0cvokm7u732v8vl/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server/branch/master) | +|Travis CI (Linux)|Appveyor w/ Bots (Windows) |Appveyor w/o Bots (Windows) | +|:---:|:---:|:---:| +|[![Linux CI](https://travis-ci.org/EQEmu/Server.svg?branch=master)](https://travis-ci.org/EQEmu/Server) |[![Build status](https://ci.appveyor.com/api/projects/status/scr25kmntx36c1ub/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server-87crp/branch/master) |[![Build status](https://ci.appveyor.com/api/projects/status/mdwbr4o9l6mxqofj/branch/master?svg=true)](https://ci.appveyor.com/project/KimLS/server-w0pq2/branch/master) | *** From 70f55179b68b5c60efb4ca7237f16117686b5e8a Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Thu, 28 Jun 2018 22:16:25 -0400 Subject: [PATCH 2/2] Switch netcode to steady_clock --- common/net/daybreak_connection.cpp | 2 +- common/net/daybreak_connection.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/net/daybreak_connection.cpp b/common/net/daybreak_connection.cpp index d32f9f678..73bb51e82 100644 --- a/common/net/daybreak_connection.cpp +++ b/common/net/daybreak_connection.cpp @@ -747,7 +747,7 @@ void EQ::Net::DaybreakConnection::ProcessDecodedPacket(const Packet &p) response.zero = 0; response.opcode = OP_SessionStatResponse; response.timestamp = request.timestamp; - response.our_timestamp = EQ::Net::HostToNetwork(std::chrono::duration_cast(std::chrono::high_resolution_clock::now().time_since_epoch()).count()); + response.our_timestamp = EQ::Net::HostToNetwork(std::chrono::duration_cast(std::chrono::steady_clock::now().time_since_epoch()).count()); response.client_sent = request.packets_sent; response.client_recv = request.packets_recv; response.server_sent = EQ::Net::HostToNetwork(m_stats.sent_packets); diff --git a/common/net/daybreak_connection.h b/common/net/daybreak_connection.h index 016ef3258..05b420133 100644 --- a/common/net/daybreak_connection.h +++ b/common/net/daybreak_connection.h @@ -68,8 +68,8 @@ namespace EQ SequencePast }; - typedef std::chrono::high_resolution_clock::time_point Timestamp; - typedef std::chrono::high_resolution_clock Clock; + typedef std::chrono::steady_clock::time_point Timestamp; + typedef std::chrono::steady_clock Clock; struct DaybreakConnectionStats { @@ -282,4 +282,4 @@ namespace EQ friend class DaybreakConnection; }; } -} \ No newline at end of file +}