flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Change TimeOfDay to WorldDate (#5160)

Browse Source 
* Change TimeOfDay to WorldDate

* Do not wrap at 20 minutes, continue incrementing
* Fixes #4737
* Fixes #5159
This commit is contained in:
Tiger Wang
2021-03-20 20:58:19 +00:00
committed by GitHub
parent 55ba39ca0e
commit 90369deb5a
12 changed files with 68 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Protocol/Protocol_1_8.cpp
View File

@@ -1566,18 +1566,20 @@ void cProtocol_1_8_0::SendTitleTimes(int a_FadeInTicks, int a_DisplayTicks, int
void cProtocol_1_8_0::SendTimeUpdate(Int64 a_WorldAge, Int64 a_TimeOfDay, bool a_DoDaylightCycle)
void cProtocol_1_8_0::SendTimeUpdate(Int64 a_WorldAge, Int64 a_WorldDate, 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);
// 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);
}
cPacketizer Pkt(*this, pktTimeUpdate);
Pkt.WriteBEInt64(a_WorldAge);
Pkt.WriteBEInt64(a_TimeOfDay);
Pkt.WriteBEInt64(a_WorldDate);
}