diff options
author | Franz Reiter <franzi.moos@googlemail.com> | 2014-08-12 16:05:33 +0200 |
---|---|---|
committer | Franz Reiter <franzi.moos@googlemail.com> | 2014-08-12 16:05:33 +0200 |
commit | 8f0c4911f7564f6f8b73ad3f6920b2ac649f422d (patch) | |
tree | 8c4406712a9634f3b300fb79b1fb4f462f9b2b59 /src/Protocol/Protocol17x.cpp | |
parent | Merge pull request #1316 from ChriPiv/master (diff) | |
parent | Exported daylight cycle flag to the protocol. (diff) | |
download | cuberite-8f0c4911f7564f6f8b73ad3f6920b2ac649f422d.tar cuberite-8f0c4911f7564f6f8b73ad3f6920b2ac649f422d.tar.gz cuberite-8f0c4911f7564f6f8b73ad3f6920b2ac649f422d.tar.bz2 cuberite-8f0c4911f7564f6f8b73ad3f6920b2ac649f422d.tar.lz cuberite-8f0c4911f7564f6f8b73ad3f6920b2ac649f422d.tar.xz cuberite-8f0c4911f7564f6f8b73ad3f6920b2ac649f422d.tar.zst cuberite-8f0c4911f7564f6f8b73ad3f6920b2ac649f422d.zip |
Diffstat (limited to '')
-rw-r--r-- | src/Protocol/Protocol17x.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp index 1f8ca00bb..56e73c1c1 100644 --- a/src/Protocol/Protocol17x.cpp +++ b/src/Protocol/Protocol17x.cpp @@ -1289,9 +1289,14 @@ void cProtocol172::SendThunderbolt(int a_BlockX, int a_BlockY, int a_BlockZ) -void cProtocol172::SendTimeUpdate(Int64 a_WorldAge, Int64 a_TimeOfDay) +void cProtocol172::SendTimeUpdate(Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle) { ASSERT(m_State == 3); // In game mode? + if (!a_DoDaylightCycle) + { + // When writing a "-" before the number the client ignores it but it will stop the client-side time expiration. + a_TimeOfDay = std::min(-a_TimeOfDay, -1LL); + } cPacketizer Pkt(*this, 0x03); Pkt.WriteInt64(a_WorldAge); |