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

World: Remember the age persistently. (#3556)

Browse Source
This commit is contained in:
Mattes D 2017-01-19 22:45:23 +01:00 committed by GitHub
parent dfa8f278ea
commit 97980d1103
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/World.cpp
View File

@ -471,6 +471,8 @@ void cWorld::Start(cDeadlockDetect & a_DeadlockDetect)
int GameMode = IniFile.GetValueSetI("General", "Gamemode", static_cast<int>(m_GameMode)); int GameMode = IniFile.GetValueSetI("General", "Gamemode", static_cast<int>(m_GameMode));
int Weather = IniFile.GetValueSetI("General", "Weather", static_cast<int>(m_Weather)); int Weather = IniFile.GetValueSetI("General", "Weather", static_cast<int>(m_Weather));
m_WorldAge = std::chrono::milliseconds(IniFile.GetValueSetI("General", "WorldAgeMS", 0LL));
// Load the weather frequency data: // Load the weather frequency data:
if (m_Dimension == dimOverworld) if (m_Dimension == dimOverworld)
{ {
@ -937,6 +939,7 @@ void cWorld::Stop(cDeadlockDetect & a_DeadlockDetect)
IniFile.SetValueB("General", "IsDaylightCycleEnabled", m_IsDaylightCycleEnabled); IniFile.SetValueB("General", "IsDaylightCycleEnabled", m_IsDaylightCycleEnabled);
IniFile.SetValueI("General", "Weather", static_cast<int>(m_Weather)); IniFile.SetValueI("General", "Weather", static_cast<int>(m_Weather));
IniFile.SetValueI("General", "TimeInTicks", GetTimeOfDay()); IniFile.SetValueI("General", "TimeInTicks", GetTimeOfDay());
IniFile.SetValueI("General", "WorldAgeMS", static_cast<Int64>(m_WorldAge.count()));
IniFile.WriteFile(m_IniFileName); IniFile.WriteFile(m_IniFileName);
m_TickThread.Stop(); m_TickThread.Stop();

5
src/World.h
View File

@ -897,8 +897,11 @@ private:
bool m_BroadcastAchievementMessages; bool m_BroadcastAchievementMessages;
bool m_IsDaylightCycleEnabled; bool m_IsDaylightCycleEnabled;
// std::chrono::milliseconds is guaranteed to be good for 292 years by the standard.
/** The age of the world.
Monotonic, always increasing each game tick, persistent across server restart. */
std::chrono::milliseconds m_WorldAge; std::chrono::milliseconds m_WorldAge;
std::chrono::milliseconds m_TimeOfDay; std::chrono::milliseconds m_TimeOfDay;
cTickTimeLong m_LastTimeUpdate; // The tick in which the last time update has been sent. cTickTimeLong m_LastTimeUpdate; // The tick in which the last time update has been sent.
cTickTimeLong m_LastChunkCheck; // The last WorldAge (in ticks) in which unloading and possibly saving was triggered cTickTimeLong m_LastChunkCheck; // The last WorldAge (in ticks) in which unloading and possibly saving was triggered