summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol14x.cpp
diff options
context:
space:
mode:
authorFranz Reiter <franzi.moos@googlemail.com>2014-08-12 16:05:33 +0200
committerFranz Reiter <franzi.moos@googlemail.com>2014-08-12 16:05:33 +0200
commit8f0c4911f7564f6f8b73ad3f6920b2ac649f422d (patch)
tree8c4406712a9634f3b300fb79b1fb4f462f9b2b59 /src/Protocol/Protocol14x.cpp
parentMerge pull request #1316 from ChriPiv/master (diff)
parentExported daylight cycle flag to the protocol. (diff)
downloadcuberite-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 'src/Protocol/Protocol14x.cpp')
-rw-r--r--src/Protocol/Protocol14x.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp
index 8b177ea48..3b6b6a42a 100644
--- a/src/Protocol/Protocol14x.cpp
+++ b/src/Protocol/Protocol14x.cpp
@@ -130,8 +130,14 @@ void cProtocol142::SendSoundParticleEffect(int a_EffectID, int a_SrcX, int a_Src
-void cProtocol142::SendTimeUpdate(Int64 a_WorldAge, Int64 a_TimeOfDay)
+void cProtocol142::SendTimeUpdate(Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle)
{
+ 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);
+ }
+
cCSLock Lock(m_CSPacket);
WriteByte (PACKET_UPDATE_TIME);
WriteInt64(a_WorldAge);