diff options
| -rw-r--r-- | src/server/worldserver/Main.cpp | 7 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/server/worldserver/Main.cpp b/src/server/worldserver/Main.cpp index e08e9610965..bad72919f6a 100644 --- a/src/server/worldserver/Main.cpp +++ b/src/server/worldserver/Main.cpp @@ -70,8 +70,6 @@ namespace fs = boost::filesystem; #define _TRINITY_CORE_CONFIG "worldserver.conf" #endif -#define WORLD_SLEEP_CONST 1 - #ifdef _WIN32 #include "ServiceWin32.h" char serviceName[] = "worldserver"; @@ -489,6 +487,7 @@ void ShutdownCLIThread(std::thread* cliThread) void WorldUpdateLoop() { + uint32 minUpdateDiff = uint32(sConfigMgr->GetIntDefault("MinWorldUpdateTime", 1)); uint32 realCurrTime = 0; uint32 realPrevTime = getMSTime(); @@ -504,10 +503,10 @@ void WorldUpdateLoop() realCurrTime = getMSTime(); uint32 diff = getMSTimeDiff(realPrevTime, realCurrTime); - if (!diff) + if (diff < minUpdateDiff) { // sleep until enough time passes that we can update all timers - std::this_thread::sleep_for(std::chrono::milliseconds(1)); + std::this_thread::sleep_for(Milliseconds(minUpdateDiff - diff)); continue; } diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 280db1d61ab..71e82176a91 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -362,6 +362,13 @@ SessionAddDelay = 10000 GridCleanUpDelay = 300000 # +# MinWorldUpdateTime +# Description: Minimum time (milliseconds) between world update ticks (for mostly idle servers). +# Default: 1 - (0.001 second) + +MinWorldUpdateTime = 1 + +# # MapUpdateInterval # Description: Time (milliseconds) for map update interval. # Default: 10 - (0.01 second) |