diff options
| author | Kelno <kelno@users.noreply.github.com> | 2021-08-19 16:07:54 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-03-13 14:27:10 +0100 |
| commit | 6b8d03d71e5511d0f2012eec3d11e578d03c2d0f (patch) | |
| tree | 393ea4acea7b72448da9555029f7413bb3e3b745 /src/server/game | |
| parent | eff9b5042dd7b0cc5a93679994d026c59052755c (diff) | |
Don't count character pending deletion towards character per account limit (#26837)
* Don't count character pending deletion towards character per account limit
* Never show more than 10 characters char enum
* Use constants
(cherry picked from commit e2f20aff8ab3f526f513203e08915e7291386f50)
Diffstat (limited to 'src/server/game')
| -rw-r--r-- | src/server/game/Handlers/CharacterHandler.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 17588a3e0fb..48f22613bdf 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -449,7 +449,7 @@ void WorldSession::HandleCharEnum(CharacterDatabaseQueryHolder const& holder) charEnum.MaxCharacterLevel = std::max<int32>(charEnum.MaxCharacterLevel, charInfo.ExperienceLevel); } - while (result->NextRow()); + while (result->NextRow() && charEnum.Characters.size() < MAX_CHARACTERS_PER_REALM); } charEnum.IsAlliedRacesCreationAllowed = CanAccessAlliedRaces(); diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index c0ffdabe527..7b04ccaf462 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -926,8 +926,7 @@ void World::LoadConfigSettings(bool reload) m_int_configs[CONFIG_CHARACTERS_PER_REALM] = sConfigMgr->GetIntDefault("CharactersPerRealm", 50); if (m_int_configs[CONFIG_CHARACTERS_PER_REALM] < 1 || m_int_configs[CONFIG_CHARACTERS_PER_REALM] > MAX_CHARACTERS_PER_REALM) { - TC_LOG_ERROR("server.loading", "CharactersPerRealm (%i) must be in range 1..%d. Set to %d.", - m_int_configs[CONFIG_CHARACTERS_PER_REALM], MAX_CHARACTERS_PER_REALM, MAX_CHARACTERS_PER_REALM); + TC_LOG_ERROR("server.loading", "CharactersPerRealm (%i) must be in range 1..%u. Set to %u.", m_int_configs[CONFIG_CHARACTERS_PER_REALM], MAX_CHARACTERS_PER_REALM, MAX_CHARACTERS_PER_REALM); m_int_configs[CONFIG_CHARACTERS_PER_REALM] = MAX_CHARACTERS_PER_REALM; } |