summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.cpp
diff options
context:
space:
mode:
authorHowaner <franzi.moos@googlemail.com>2014-08-11 00:20:28 +0200
committerHowaner <franzi.moos@googlemail.com>2014-08-11 00:20:28 +0200
commit47c928cab7d1ff73e50925bc7ef50586b6ec9821 (patch)
treee267ba521071e0d355eb6ed02a06791fd6e4552f /src/Protocol/Protocol17x.cpp
parentAdded a comment and simplified code. (diff)
downloadcuberite-47c928cab7d1ff73e50925bc7ef50586b6ec9821.tar
cuberite-47c928cab7d1ff73e50925bc7ef50586b6ec9821.tar.gz
cuberite-47c928cab7d1ff73e50925bc7ef50586b6ec9821.tar.bz2
cuberite-47c928cab7d1ff73e50925bc7ef50586b6ec9821.tar.lz
cuberite-47c928cab7d1ff73e50925bc7ef50586b6ec9821.tar.xz
cuberite-47c928cab7d1ff73e50925bc7ef50586b6ec9821.tar.zst
cuberite-47c928cab7d1ff73e50925bc7ef50586b6ec9821.zip
Diffstat (limited to 'src/Protocol/Protocol17x.cpp')
-rw-r--r--src/Protocol/Protocol17x.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 318342f09..a724133fc 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1286,9 +1286,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);