diff options
| -rw-r--r-- | data/sql/updates/db_world/2025_11_23_00.sql (renamed from data/sql/updates/pending_db_world/rev_1763907556540962700.sql) | 1 | ||||
| -rw-r--r-- | data/sql/updates/db_world/2025_11_24_00.sql | 6 | ||||
| -rw-r--r-- | src/cmake/macros/FindMySQL.cmake | 3 | ||||
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScript.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 2 |
5 files changed, 11 insertions, 3 deletions
diff --git a/data/sql/updates/pending_db_world/rev_1763907556540962700.sql b/data/sql/updates/db_world/2025_11_23_00.sql index 3fb5c89eea..a883f44c84 100644 --- a/data/sql/updates/pending_db_world/rev_1763907556540962700.sql +++ b/data/sql/updates/db_world/2025_11_23_00.sql @@ -1,2 +1,3 @@ +-- DB update 2025_11_21_07 -> 2025_11_23_00 -- UPDATE `gameobject` SET `spawntimesecs` = 1800 WHERE `id` = 193997 AND `guid` IN (1161,1162,1163,1164,1165,1166,1167,1168,1169,1170,3721,3722,3723,3724,3725,3726,3727,3728,3729,3730,3731,3732,3733,3734,3735,3736,3737,3738,3739,3740,3741,3742,3743,3744,3745,3746,3747,3748,3749,3750,3751,3752,3753,3754,3755,3756,3757,3758,3759,3760,3761,221001); diff --git a/data/sql/updates/db_world/2025_11_24_00.sql b/data/sql/updates/db_world/2025_11_24_00.sql new file mode 100644 index 0000000000..ccbf878eb1 --- /dev/null +++ b/data/sql/updates/db_world/2025_11_24_00.sql @@ -0,0 +1,6 @@ +-- DB update 2025_11_23_00 -> 2025_11_24_00 +-- +-- Set GOSSIP flag +UPDATE `creature_template` SET `npcflag` = `npcflag` | 1 WHERE (`entry` IN (34712, 34713, 34714, 34786, 34785)); +-- 10568 -- Hello, $N. If you're looking for cooking training, you've come to the right place. I usually get lots of new students when Pilgrim's Bounty rolls around. +UPDATE `creature_template` SET `gossip_menu_id` = 10568 WHERE (`entry` IN (34708, 34712, 34713, 34714, 34786, 34785, 34711)); diff --git a/src/cmake/macros/FindMySQL.cmake b/src/cmake/macros/FindMySQL.cmake index 2a8de7e7a8..999dadc48d 100644 --- a/src/cmake/macros/FindMySQL.cmake +++ b/src/cmake/macros/FindMySQL.cmake @@ -137,7 +137,6 @@ if(WIN32) ) list(SORT _MYSQL_ROOT_HINTS_SUBKEYS COMPARE NATURAL ORDER DESCENDING) - set(_MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS) foreach(subkey IN LISTS _MYSQL_ROOT_HINTS_SUBKEYS) cmake_host_system_information( RESULT @@ -147,7 +146,7 @@ if(WIN32) "HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\${subkey}" VALUE "Location" VIEW BOTH ) - list(APPEND _MYSQL_ROOT_HINTS_REGISTRY_LOCATIONS ${_MYSQL_ROOT_HINTS_REGISTRY_LOCATION}) + list(APPEND _MYSQL_ROOT_HINTS ${_MYSQL_ROOT_HINTS_REGISTRY_LOCATION}) endforeach() file(GLOB _MYSQL_ROOT_PATHS_VERSION_SUBDIRECTORIES diff --git a/src/server/game/AI/SmartScripts/SmartScript.cpp b/src/server/game/AI/SmartScripts/SmartScript.cpp index a9b42edeb4..e7a5c4fd84 100644 --- a/src/server/game/AI/SmartScripts/SmartScript.cpp +++ b/src/server/game/AI/SmartScripts/SmartScript.cpp @@ -2696,6 +2696,8 @@ void SmartScript::ProcessAction(SmartScriptHolder& e, Unit* unit, uint32 var0, u { if (me && me->FindMap()) me->FindMap()->LoadGrid(e.target.x, e.target.y); + else if (go && go->FindMap()) + go->FindMap()->LoadGrid(e.target.x, e.target.y); break; } case SMART_ACTION_PLAYER_TALK: diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 04ff5ba9b1..254328b809 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -125,7 +125,7 @@ WorldSession::WorldSession(uint32 id, std::string&& name, uint32 accountFlags, s m_playerLogout(false), m_playerRecentlyLogout(false), m_playerSave(false), - m_sessionDbcLocale(sWorld->GetDefaultDbcLocale()), + m_sessionDbcLocale(sWorld->GetAvailableDbcLocale(locale)), m_sessionDbLocaleIndex(locale), m_latency(0), m_TutorialsChanged(false), |