fang139842/azerothcore-wotlk2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mail_server_template_items

Browse Source
This commit is contained in:
sudlud 2025-02-24 06:27:30 +01:00 committed by GitHub
commit 591b5fc61f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/codestyle/codestyle-sql.py
View File

@ -234,7 +234,7 @@ def backtick_check(file: io, file_path: str) -> None:
# Skip SQL keywords
if word.upper() in {"SELECT", "FROM", "JOIN", "WHERE", "GROUP", "BY", "ORDER",
"DELETE", "UPDATE", "INSERT", "INTO", "SET", "VALUES", "AND",
"IN", "OR", "REPLACE"}:
"IN", "OR", "REPLACE", "NOT"}:
continue
# Make sure the word is enclosed in backticks

3
data/sql/updates/db_world/2025_02_24_00.sql Normal file
View File

@ -0,0 +1,3 @@
-- DB update 2025_02_22_00 -> 2025_02_24_00
--
UPDATE `creature_template` SET `flags_extra` = `flags_extra`|512|2147483648 WHERE `entry` = 25038;

6
src/server/game/World/World.cpp
View File

@ -172,10 +172,10 @@ void World::LoadConfigSettings(bool reload)
LOG_ERROR("server.loading", "World settings reload fail: can't read settings.");
return;
}
}
sLog->LoadFromConfig();
sMetric->LoadFromConfigs();
sLog->LoadFromConfig();
sMetric->LoadFromConfigs();
}
// Set realm id and enable db logging
sLog->SetRealmId(realm.Id.Realm);