summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@outlook.com>2021-03-18 00:18:02 +0100
committerTiger Wang <ziwei.tiger@outlook.com>2021-03-19 12:23:30 +0100
commit55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f (patch)
tree4ec40239f2f1e2225b14faba1b4e5aa110e1a471 /src/World.cpp
parentDeduplicate WriteBlockEntity (diff)
downloadcuberite-55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f.tar
cuberite-55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f.tar.gz
cuberite-55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f.tar.bz2
cuberite-55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f.tar.lz
cuberite-55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f.tar.xz
cuberite-55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f.tar.zst
cuberite-55ba39ca0e2d4aed9c0c1b3e030727728ea0a02f.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp36
1 files changed, 25 insertions, 11 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 3e00e2fd5..e0f0b6c1c 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -91,7 +91,7 @@ namespace World
////////////////////////////////////////////////////////////////////////////////
// cWorld::cLock:
-cWorld::cLock::cLock(cWorld & a_World) :
+cWorld::cLock::cLock(const cWorld & a_World) :
Super(&(a_World.m_ChunkMap.GetCS()))
{
}
@@ -168,7 +168,7 @@ cWorld::cWorld(
m_IsDaylightCycleEnabled(true),
m_WorldAge(0),
m_TimeOfDay(0),
- m_LastTimeUpdate(0),
+ m_WorldTickAge(0),
m_LastChunkCheck(0),
m_LastSave(0),
m_SkyDarkness(0),
@@ -959,33 +959,38 @@ void cWorld::Stop(cDeadlockDetect & a_DeadlockDetect)
void cWorld::Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_LastTickDurationMSec)
{
- // Call the plugins
+ // Notify the plugins:
cPluginManager::Get()->CallHookWorldTick(*this, a_Dt, a_LastTickDurationMSec);
m_WorldAge += a_Dt;
+ m_WorldTickAge += 1;
if (m_IsDaylightCycleEnabled)
{
- // We need sub-tick precision here, that's why we store the time in milliseconds and calculate ticks off of it
m_TimeOfDay += a_Dt;
- // Wrap time of day each 20 minutes (1200 seconds)
+ // Wrap time of day every 20 minutes (1200 seconds):
if (m_TimeOfDay > std::chrono::minutes(20))
{
m_TimeOfDay -= std::chrono::minutes(20);
}
- // Updates the sky darkness based on current time of day
+ // Updates the sky darkness based on current time of day:
UpdateSkyDarkness();
- // Broadcast time update every 40 ticks (2 seconds)
- if (m_LastTimeUpdate < m_WorldAge - cTickTime(40))
+ // Broadcast time update every 64 ticks (3.2 seconds):
+ if ((m_WorldTickAge % 64) == 0)
{
BroadcastTimeUpdate();
- m_LastTimeUpdate = std::chrono::duration_cast<cTickTimeLong>(m_WorldAge);
}
}
+ // Broadcast player list pings every 256 ticks (12.8 seconds):
+ if ((m_WorldTickAge % 256) == 0)
+ {
+ BroadcastPlayerListUpdatePing();
+ }
+
TickQueuedChunkDataSets();
TickQueuedBlocks();
m_ChunkMap.Tick(a_Dt);
@@ -993,11 +998,10 @@ void cWorld::Tick(std::chrono::milliseconds a_Dt, std::chrono::milliseconds a_La
TickQueuedEntityAdditions();
m_MapManager.TickMaps();
TickQueuedTasks();
+ TickWeather(static_cast<float>(a_Dt.count()));
GetSimulatorManager()->Simulate(static_cast<float>(a_Dt.count()));
- TickWeather(static_cast<float>(a_Dt.count()));
-
if (m_WorldAge - m_LastChunkCheck > std::chrono::seconds(10))
{
// Unload every 10 seconds
@@ -2535,6 +2539,16 @@ bool cWorld::ForEachEntityInBox(const cBoundingBox & a_Box, cEntityCallback a_Ca
+size_t cWorld::GetPlayerCount() const
+{
+ cLock Lock(*this);
+ return m_Players.size();
+}
+
+
+
+
+
bool cWorld::DoWithEntityByID(UInt32 a_UniqueID, cEntityCallback a_Callback)
{
// First check the entities-to-add: