summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.cpp
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2014-08-14 01:04:01 +0200
committermadmaxoft <github@xoft.cz>2014-08-14 01:04:01 +0200
commit45068f9bf45fe952429bd200d9d9d747eeba61e8 (patch)
tree94adc35088c801f5f1842aa95578b06831da6b53 /src/Protocol/Protocol17x.cpp
parentRankMgr: Fixed multithreading issues. (diff)
parentCheckBasicStyle checks the src folder as well. (diff)
downloadcuberite-45068f9bf45fe952429bd200d9d9d747eeba61e8.tar
cuberite-45068f9bf45fe952429bd200d9d9d747eeba61e8.tar.gz
cuberite-45068f9bf45fe952429bd200d9d9d747eeba61e8.tar.bz2
cuberite-45068f9bf45fe952429bd200d9d9d747eeba61e8.tar.lz
cuberite-45068f9bf45fe952429bd200d9d9d747eeba61e8.tar.xz
cuberite-45068f9bf45fe952429bd200d9d9d747eeba61e8.tar.zst
cuberite-45068f9bf45fe952429bd200d9d9d747eeba61e8.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 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);