diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/Banner.cpp | 2 | ||||
| -rw-r--r-- | src/server/authserver/Main.cpp | 2 | ||||
| -rw-r--r-- | src/server/database/Database/DatabaseLoader.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/Language.h | 2 | ||||
| -rw-r--r-- | src/server/game/Scripting/ScriptMgr.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/World/World.cpp | 2 | ||||
| -rw-r--r-- | src/server/worldserver/worldserver.conf.dist | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/common/Banner.cpp b/src/common/Banner.cpp index 7d96504eabe..9220a1b8fcd 100644 --- a/src/common/Banner.cpp +++ b/src/common/Banner.cpp @@ -31,7 +31,7 @@ void Trinity::Banner::Show(char const* applicationName, void(*log)(char const* t log(R"( \ \_\ \_\ \ \_\ \_\ \_\ \_\ \__\\/`____ \)"); log(R"( \/_/\/_/ \/_/\/_/\/_/\/_/\/__/ `/___/> \)"); log(R"( C O R E /\___/)"); - log(R"(http://TrinityCore.org \/__/)" "\n"); + log(R"(https://TrinityCore.org \/__/)" "\n"); if (logExtraInfo) logExtraInfo(); diff --git a/src/server/authserver/Main.cpp b/src/server/authserver/Main.cpp index 7e521b9a338..b254e9c28fe 100644 --- a/src/server/authserver/Main.cpp +++ b/src/server/authserver/Main.cpp @@ -297,7 +297,7 @@ void KeepDatabaseAliveHandler(std::weak_ptr<Trinity::Asio::DeadlineTimer> dbPing { if (std::shared_ptr<Trinity::Asio::DeadlineTimer> dbPingTimer = dbPingTimerRef.lock()) { - TC_LOG_INFO("server.authserver", "Ping MySQL to keep connection alive"); + TC_LOG_DEBUG("sql.driver", "Ping MySQL to keep connection alive"); LoginDatabase.KeepAlive(); dbPingTimer->expires_after(std::chrono::minutes(dbPingInterval)); diff --git a/src/server/database/Database/DatabaseLoader.cpp b/src/server/database/Database/DatabaseLoader.cpp index bc66fb32591..416370d6dd2 100644 --- a/src/server/database/Database/DatabaseLoader.cpp +++ b/src/server/database/Database/DatabaseLoader.cpp @@ -68,7 +68,7 @@ DatabaseLoader& DatabaseLoader::AddDatabase(DatabaseWorkerPool<T>& pool, std::st if (error) { TC_LOG_ERROR("sql.driver", "\nDatabasePool {} NOT opened. There were errors opening the MySQL connections. Check your SQLDriverLogFile " - "for specific errors. Read wiki at http://www.trinitycore.info/display/tc/TrinityCore+Home", name); + "for specific errors. Read wiki at https://www.trinitycore.info", name); return false; } diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index 5ad1cef8d55..7df9976243c 100644 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -1015,7 +1015,7 @@ enum TrinityStrings LANG_CMDPARSER_SPELL_NO_EXIST = 1514, LANG_CMDPARSER_EXACT_SEQ_MISMATCH = 1515, LANG_CMDPARSER_CURRENCY_NO_EXIST = 1516, // master branch ONLY - LANG_CMDPARSER_QUEST_NO_EXIST = 1517, // RESERVED future cherry-pick + LANG_CMDPARSER_QUEST_NO_EXIST = 1517, // 1516-1996 - free LANG_DEBUG_AREATRIGGER_ENTITY_ENTERED = 1997, // master branch ONLY diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp index d51b12bee81..4f22049223b 100644 --- a/src/server/game/Scripting/ScriptMgr.cpp +++ b/src/server/game/Scripting/ScriptMgr.cpp @@ -809,8 +809,8 @@ public: } else { - // The script uses a script name from database, but isn't assigned to anything. - TC_LOG_ERROR("sql.sql", "Script '{}' exists in the core, but the database does not assign it to any creature.", + // The script exist in the core, but isn't assigned to anything in the database. + TC_LOG_ERROR("sql.sql", "Script '{}' exists in the core, but is not referenced by the database!", script->GetName()); // Avoid calling "delete script;" because we are currently in the script constructor diff --git a/src/server/game/World/World.cpp b/src/server/game/World/World.cpp index eece2729411..41235455857 100644 --- a/src/server/game/World/World.cpp +++ b/src/server/game/World/World.cpp @@ -2557,7 +2557,7 @@ void World::Update(uint32 diff) { TC_METRIC_TIMER("world_update_time", TC_METRIC_TAG("type", "Ping MySQL")); m_timers[WUPDATE_PINGDB].Reset(); - TC_LOG_DEBUG("misc", "Ping MySQL to keep connection alive"); + TC_LOG_DEBUG("sql.driver", "Ping MySQL to keep connection alive"); CharacterDatabase.KeepAlive(); LoginDatabase.KeepAlive(); WorldDatabase.KeepAlive(); diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist index 90df12387f3..344f36e3660 100644 --- a/src/server/worldserver/worldserver.conf.dist +++ b/src/server/worldserver/worldserver.conf.dist @@ -728,7 +728,7 @@ CharacterCreating.Disabled = 0 # # CharacterCreating.Disabled.RaceMask # Description: Mask of races which cannot be created by players. -# Example: 1536 - (1024 + 512, Blood Elf and Draenei races are disabled) +# Example: 1536 - (512 + 1024, Blood Elf and Draenei races are disabled) # Default: 0 - (Enabled, All races are allowed) # 1 - (Disabled, Human) # 2 - (Disabled, Orc) |