summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol_1_8.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2021-04-05 02:38:43 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2021-04-12 23:35:07 +0200
commit4cd49d7eca5f8fd53eb98577a1f218a5086704bb (patch)
tree09bf29a1d30a37445796ed70867f934435c4261f /src/Protocol/Protocol_1_8.cpp
parentFixed generator for the Mega Taiga biome (#5129) (diff)
downloadcuberite-4cd49d7eca5f8fd53eb98577a1f218a5086704bb.tar
cuberite-4cd49d7eca5f8fd53eb98577a1f218a5086704bb.tar.gz
cuberite-4cd49d7eca5f8fd53eb98577a1f218a5086704bb.tar.bz2
cuberite-4cd49d7eca5f8fd53eb98577a1f218a5086704bb.tar.lz
cuberite-4cd49d7eca5f8fd53eb98577a1f218a5086704bb.tar.xz
cuberite-4cd49d7eca5f8fd53eb98577a1f218a5086704bb.tar.zst
cuberite-4cd49d7eca5f8fd53eb98577a1f218a5086704bb.zip
Diffstat (limited to '')
-rw-r--r--src/Protocol/Protocol_1_8.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/Protocol/Protocol_1_8.cpp b/src/Protocol/Protocol_1_8.cpp
index 7d4dfb85d..3c377ce21 100644
--- a/src/Protocol/Protocol_1_8.cpp
+++ b/src/Protocol/Protocol_1_8.cpp
@@ -1566,20 +1566,23 @@ void cProtocol_1_8_0::SendTitleTimes(int a_FadeInTicks, int a_DisplayTicks, int
-void cProtocol_1_8_0::SendTimeUpdate(Int64 a_WorldAge, Int64 a_WorldDate, bool a_DoDaylightCycle)
+void cProtocol_1_8_0::SendTimeUpdate(const cTickTimeLong a_WorldAge, const cTickTimeLong a_WorldDate, const bool a_DoDaylightCycle)
{
ASSERT(m_State == 3); // In game mode?
- if (!a_DoDaylightCycle)
+ cPacketizer Pkt(*this, pktTimeUpdate);
+ Pkt.WriteBEInt64(a_WorldAge.count());
+
+ if (a_DoDaylightCycle)
+ {
+ Pkt.WriteBEInt64(a_WorldDate.count());
+ }
+ else
{
// Negating the date stops time from advancing on the client
// (the std::min construction is to handle the case where the date is exactly zero):
- a_WorldDate = std::min(-a_WorldDate, -1LL);
+ Pkt.WriteBEInt64(std::min(-a_WorldDate.count(), -1LL));
}
-
- cPacketizer Pkt(*this, pktTimeUpdate);
- Pkt.WriteBEInt64(a_WorldAge);
- Pkt.WriteBEInt64(a_WorldDate);
}