diff options
Diffstat (limited to 'src/trinitycore')
| -rw-r--r-- | src/trinitycore/Master.cpp | 2 | ||||
| -rw-r--r-- | src/trinitycore/trinitycore.conf.dist | 86 |
2 files changed, 43 insertions, 45 deletions
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp index 317a3a31a15..eea1606256c 100644 --- a/src/trinitycore/Master.cpp +++ b/src/trinitycore/Master.cpp @@ -474,7 +474,7 @@ void Master::clearOnlineAccounts() "AND id IN (SELECT acctid FROM realmcharacters WHERE realmid = '%d')",realmID); - CharacterDatabase.Execute("UPDATE characters SET online = 0"); + CharacterDatabase.Execute("UPDATE characters SET online = 0 WHERE online<>0"); } /// Handle termination signals diff --git a/src/trinitycore/trinitycore.conf.dist b/src/trinitycore/trinitycore.conf.dist index efcaea714ef..214437cd60a 100644 --- a/src/trinitycore/trinitycore.conf.dist +++ b/src/trinitycore/trinitycore.conf.dist @@ -1097,6 +1097,48 @@ Death.CorpseReclaimDelay.PvE = 1 ################################################################################################################### # +# Rated arena matches config +# +# MaxRatingDifference: the maximum rating difference between two groups in rated matches +# Default: 0 (disable, rating difference is discarded) +# +# RatingDiscardTimer: after the specified milliseconds has passed, +# rating information will be discarded when selecting teams for matches +# also initiates an update by this timer +# Default: 60000 +# +# AutoDistributePoints: set if arena points should be distributed automatically, or by GM command +# Default: 0 (disable) (recommended): use gm command or sql query to distribute the points +# 1 (enable): arena points are distributed automatically +# +# AutoDistributeInterval: how often should the distribution take place +# if automatic distribution is enabled +# in days +# Default: 7 (weekly) +# +################################################################################################################### + +Arena.MaxRatingDifference = 0 +Arena.RatingDiscardTimer = 60000 +Arena.AutoDistributePoints = 0 +Arena.AutoDistributeInterval = 7 + +################################################################################################################### +# +# Battleground config +# +# PrematureFinishTimer: the time to end the bg if there are less than minplayersperteam on one side +# in milliseconds +# Default: 300000 +# 0 - disable +# +################################################################################################################### + +BattleGround.PrematureFinishTimer = 300000 + + +################################################################################################################### +# # NETWORK CONFIG # # Network.Threads @@ -1158,46 +1200,6 @@ Ra.MinLevel = 3 Ra.Secure = 1 ################################################################################################################### -# -# Rated arena matches config -# -# MaxRatingDifference: the maximum rating difference between two groups in rated matches -# Default: 0 (disable, rating difference is discarded) -# -# RatingDiscardTimer: after the specified milliseconds has passed, -# rating information will be discarded when selecting teams for matches -# also initiates an update by this timer -# Default: 60000 -# -# AutoDistributePoints: set if arena points should be distributed automatically, or by GM command -# Default: 0 (disable) (recommended): use gm command or sql query to distribute the points -# 1 (enable): arena points are distributed automatically -# -# AutoDistributeInterval: how often should the distribution take place -# if automatic distribution is enabled -# in days -# Default: 7 (weekly) -# -################################################################################################################### - -Arena.MaxRatingDifference = 0 -Arena.RatingDiscardTimer = 60000 -Arena.AutoDistributePoints = 0 -Arena.AutoDistributeInterval = 7 - -################################################################################################################### -# -# Battleground config -# -# PrematureFinishTimer: the time to end the bg if there are less than minplayersperteam on one side -# in milliseconds, 0 - disabled -# Default: 0 -# -################################################################################################################### - -BattleGround.PrematureFinishTimer = 0 - -################################################################################################################### # CUSTOM SERVER OPTIONS # # PlayerStart.AllReputation @@ -1213,9 +1215,6 @@ BattleGround.PrematureFinishTimer = 0 # PlayerStart.MapsExplored # Players will start with all maps explored if enabled # -# PlayerStart.AllFlightPaths -# Players will start with all flight paths (Note: ALL flight paths, not only player's team) -# # PlayerInstantLogout # Enable or disable instant logout for all players (NOT in combat/while dueling/while falling) # Default: 0 - off @@ -1262,7 +1261,6 @@ BattleGround.PrematureFinishTimer = 0 PlayerStart.AllReputation = 0 PlayerStart.AllSpells = 0 PlayerStart.MapsExplored = 0 -PlayerStart.AllFlightPaths = 0 PlayerInstantLogout = 0 MusicInBattleground = 0 HonorPointsAfterDuel = 0 |