nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-21 19:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into Playerbot

Browse Source
This commit is contained in:
Yunfan Li
2025-05-02 16:50:45 +08:00
parent c304ccee57 b9704d4fa1
commit ce9343d916
138 changed files with 4062 additions and 3707 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/apps/authserver/Main.cpp
View File

@@ -246,7 +246,7 @@ void KeepDatabaseAliveHandler(std::weak_ptr<boost::asio::steady_timer> dbPingTim
{
if (std::shared_ptr<boost::asio::steady_timer> dbPingTimer = dbPingTimerRef.lock())
{
LOG_INFO("server.authserver", "Ping MySQL to keep connection alive");
LOG_DEBUG("sql.driver", "Ping MySQL to keep connection alive");
LoginDatabase.KeepAlive();
dbPingTimer->expires_at(Acore::Asio::SteadyTimer::GetExpirationTime(dbPingInterval));

15
src/server/apps/worldserver/worldserver.conf.dist
View File

@@ -3438,14 +3438,14 @@ Wintergrasp.Enable = 1
#
# Wintergrasp.PlayerMax
# Description: Maximum number of players allowed in Wintergrasp.
# Default: 100
# Description: Maximum number of players allowed in Wintergrasp per team.
# Default: 120
Wintergrasp.PlayerMax = 100
Wintergrasp.PlayerMax = 120
#
# Wintergrasp.PlayerMin
# Description: Minimum number of players required for Wintergrasp.
# Description: Minimum number of players required for Wintergrasp per team.
# Default: 0
Wintergrasp.PlayerMin = 0
@@ -3453,9 +3453,9 @@ Wintergrasp.PlayerMin = 0
#
# Wintergrasp.PlayerMinLvl
# Description: Required character level for the Wintergrasp battle.
# Default: 77
# Default: 75
Wintergrasp.PlayerMinLvl = 77
Wintergrasp.PlayerMinLvl = 75
#
# Wintergrasp.BattleTimer
@@ -4209,7 +4209,8 @@ AllowTwoSide.Interaction.Arena = 0
#
# AllowTwoSide.Interaction.Auction
# Description: Allow auctions between factions.
# Description: Allow auctions between factions. This flags all auction houses as Neutral,
# and would also take a Neutral auction house cut from auctions.
# Default: 0 - (Disabled)
# 1 - (Enabled)