diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-07-15 18:04:04 +0200 |
| commit | 56bd42dcf1ffdf0bf8099a1c87dc7a52ca9663ff (patch) | |
| tree | d951e7af2b120fe1ba58373aa528fb1a5f4b5263 /src/server/scripts/Commands | |
| parent | 7104e3c70f9849dfbc481084a8bd3c20d99b3036 (diff) | |
| parent | 779a59e7e218e340ac5cefd3297ea970d804239d (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/World/World.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
Diffstat (limited to 'src/server/scripts/Commands')
| -rw-r--r-- | src/server/scripts/Commands/cs_character.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Commands/cs_server.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Commands/cs_character.cpp b/src/server/scripts/Commands/cs_character.cpp index 22740335ac5..3b0e92a6905 100644 --- a/src/server/scripts/Commands/cs_character.cpp +++ b/src/server/scripts/Commands/cs_character.cpp @@ -281,7 +281,7 @@ public: if (name.empty()) continue; - char const* activeStr = target && target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index + char const* activeStr = target->GetUInt32Value(PLAYER_CHOSEN_TITLE) == titleInfo->bit_index ? handler->GetTrinityString(LANG_ACTIVE) : ""; diff --git a/src/server/scripts/Commands/cs_server.cpp b/src/server/scripts/Commands/cs_server.cpp index 2d4fa2765cf..ec8771cc2f4 100644 --- a/src/server/scripts/Commands/cs_server.cpp +++ b/src/server/scripts/Commands/cs_server.cpp @@ -153,7 +153,7 @@ public: sWorld->SetPlayerSecurityLimit(SEC_ADMINISTRATOR); else if (strncmp(paramStr, "reset", limit) == 0) { - sWorld->SetPlayerAmountLimit(ConfigMgr::GetIntDefault("PlayerLimit", 100)); + sWorld->SetPlayerAmountLimit(sConfigMgr->GetIntDefault("PlayerLimit", 100)); sWorld->LoadDBAllowedSecurityLevel(); } else |