mirror of
https://github.com/mod-playerbots/azerothcore-wotlk.git
synced 2026-02-17 17:24:33 +00:00
Merge branch 'master' into Playerbot
This commit is contained in:
@@ -49,6 +49,7 @@
|
||||
#include "SharedDefines.h"
|
||||
#include "SteadyTimer.h"
|
||||
#include "World.h"
|
||||
#include "WorldSessionMgr.h"
|
||||
#include "WorldSocket.h"
|
||||
#include "WorldSocketMgr.h"
|
||||
#include <boost/asio/signal_set.hpp>
|
||||
@@ -285,11 +286,10 @@ int main(int argc, char** argv)
|
||||
|
||||
sMetric->Initialize(realm.Name, *ioContext, []()
|
||||
{
|
||||
METRIC_VALUE("online_players", sWorld->GetPlayerCount());
|
||||
METRIC_VALUE("online_players", sWorldSessionMgr->GetPlayerCount());
|
||||
METRIC_VALUE("db_queue_login", uint64(LoginDatabase.QueueSize()));
|
||||
METRIC_VALUE("db_queue_character", uint64(CharacterDatabase.QueueSize()));
|
||||
METRIC_VALUE("db_queue_world", uint64(WorldDatabase.QueueSize()));
|
||||
sScriptMgr->OnMetricLogging();
|
||||
});
|
||||
|
||||
METRIC_EVENT("events", "Worldserver started", "");
|
||||
@@ -358,8 +358,8 @@ int main(int argc, char** argv)
|
||||
|
||||
std::shared_ptr<void> sWorldSocketMgrHandle(nullptr, [](void*)
|
||||
{
|
||||
sWorld->KickAll(); // save and kick all players
|
||||
sWorld->UpdateSessions(1); // real players unload required UpdateSessions call
|
||||
sWorldSessionMgr->KickAll(); // save and kick all players
|
||||
sWorldSessionMgr->UpdateSessions(1); // real players unload required UpdateSessions call
|
||||
|
||||
sWorldSocketMgr.StopNetwork();
|
||||
|
||||
|
||||
@@ -67,6 +67,7 @@
|
||||
# PLAYER DUMP
|
||||
# CUSTOM
|
||||
# DEBUG
|
||||
# DYNAMIC RESPAWN SETTINGS
|
||||
#
|
||||
###################################################################################################
|
||||
|
||||
@@ -290,7 +291,7 @@ FlashAtStart = 1
|
||||
# DATABASE_CHARACTER = 2, // Character database
|
||||
# DATABASE_WORLD = 4, // World database
|
||||
#
|
||||
# Default: 7 - (All enabled)
|
||||
# Default: 7 - (All enabled)
|
||||
# 4 - (Enable world only)
|
||||
# 0 - (All disabled)
|
||||
|
||||
@@ -3791,21 +3792,6 @@ Arena.QueueAnnouncer.PlayerOnly = 0
|
||||
|
||||
Arena.QueueAnnouncer.Detail = 3
|
||||
|
||||
#
|
||||
# Arena.ArenaSeason.ID
|
||||
# Description: Current arena season id shown in clients.
|
||||
# Default: 8
|
||||
|
||||
Arena.ArenaSeason.ID = 8
|
||||
|
||||
#
|
||||
# Arena.ArenaSeason.InProgress
|
||||
# Description: State of current arena season.
|
||||
# Default: 1 - (Active)
|
||||
# 0 - (Finished)
|
||||
|
||||
Arena.ArenaSeason.InProgress = 1
|
||||
|
||||
#
|
||||
# Arena.ArenaStartRating
|
||||
# Description: Start rating for new arena teams.
|
||||
@@ -4484,6 +4470,52 @@ Debug.Arena = 0
|
||||
#
|
||||
###################################################################################################
|
||||
|
||||
###################################################################################################
|
||||
# DYNAMIC RESPAWN SETTINGS
|
||||
#
|
||||
#
|
||||
# Respawn.DynamicRateCreature
|
||||
# Description: Controls how creature respawn times adjust based on player count in a zone.
|
||||
# The respawn time is unchanged up to the configured number of players.
|
||||
# As player count exceeds this value, respawn times decrease proportionally
|
||||
# (e.g., at double the player count, respawn times are halved; at triple the player count, respawns happen three times as fast).
|
||||
# Does not affect instanced creatures, bosses, or quest givers.
|
||||
# Formula: adjustFactor = rate / playerCount
|
||||
# RespawnTime = RespawnTime * adjustFactor
|
||||
# Default: 1 (Disabled)
|
||||
|
||||
Respawn.DynamicRateCreature = 1
|
||||
|
||||
#
|
||||
# Respawn.DynamicMinimumCreature
|
||||
# Description: The minimum respawn time for a creature under dynamic scaling.
|
||||
# Default: 10 - (10 seconds)
|
||||
|
||||
Respawn.DynamicMinimumCreature = 10
|
||||
|
||||
#
|
||||
# Respawn.DynamicRateGameObject
|
||||
# Description: Controls how gameobject respawn times adjust based on player count in a zone.
|
||||
# The respawn time is unchanged up to the configured number of players.
|
||||
# As player count exceeds this value, respawn times decrease proportionally
|
||||
# (e.g., at double the player count, respawn times are halved; at triple the player count, respawns happen three times as fast).
|
||||
# Does not affect instanced objects or quest givers.
|
||||
# Formula: adjustFactor = rate / playerCount
|
||||
# RespawnTime = RespawnTime * adjustFactor
|
||||
# Default: 1 (Disabled)
|
||||
|
||||
Respawn.DynamicRateGameObject = 1
|
||||
|
||||
#
|
||||
# Respawn.DynamicMinimumGameObject
|
||||
# Description: The minimum respawn time for a gameobject under dynamic scaling.
|
||||
# Default: 10 - (10 seconds)
|
||||
|
||||
Respawn.DynamicMinimumGameObject = 10
|
||||
|
||||
#
|
||||
###################################################################################################
|
||||
|
||||
###################################################################################################
|
||||
# #
|
||||
# GAME SETTINGS END #
|
||||
|
||||
Reference in New Issue
Block a user