diff --git a/data/sql/updates/db_world/2024_04_27_00.sql b/data/sql/updates/db_world/2024_04_27_00.sql new file mode 100644 index 000000000..288cdfa18 --- /dev/null +++ b/data/sql/updates/db_world/2024_04_27_00.sql @@ -0,0 +1,7 @@ +-- DB update 2024_04_25_01 -> 2024_04_27_00 +-- Update gameobject 'AuctionNode' with sniffed values +-- new spawns +DELETE FROM `gameobject` WHERE (`id` IN (152583)) +AND (`guid` IN (24)); +INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `ScriptName`, `VerifiedBuild`, `Comment`) VALUES +(24, 152583, 1, 0, 0, 1, 1, -1257.8424072265625, 24.41799354553222656, 128.217498779296875, 2.888511419296264648, 0, 0, 0.99200439453125, 0.126203224062919616, 120, 255, 1, "", 50250, NULL); diff --git a/data/sql/updates/db_world/2024_04_29_00.sql b/data/sql/updates/db_world/2024_04_29_00.sql new file mode 100644 index 000000000..27a5e333c --- /dev/null +++ b/data/sql/updates/db_world/2024_04_29_00.sql @@ -0,0 +1,7 @@ +-- DB update 2024_04_27_00 -> 2024_04_29_00 +UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ä','ä') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ü','ü') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `OptionText`=REPLACE(`OptionText`,'ö','ö') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `BoxText`=REPLACE(`BoxText`,'ä','ä') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `BoxText`=REPLACE(`BoxText`,'ü','ü') WHERE `Locale`='deDE'; +UPDATE `gossip_menu_option_locale` SET `BoxText`=REPLACE(`BoxText`,'ö','ö') WHERE `Locale`='deDE'; diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h index b3161627b..51e85e385 100644 --- a/src/server/game/Battlegrounds/Zones/BattlegroundEY.h +++ b/src/server/game/Battlegrounds/Zones/BattlegroundEY.h @@ -33,7 +33,7 @@ enum BG_EY_Events enum BG_EY_Timers { - BG_EY_FLAG_RESPAWN_TIME = 20 * IN_MILLISECONDS, + BG_EY_FLAG_RESPAWN_TIME = 10 * IN_MILLISECONDS, BG_EY_FLAG_ON_GROUND_TIME = 10 * IN_MILLISECONDS, BG_EY_FPOINTS_CHECK_TIME = 2 * IN_MILLISECONDS, BG_EY_FPOINTS_TICK_TIME = 1 * IN_MILLISECONDS diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 83f21ac4c..0db064434 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -406,7 +406,7 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u } } - LastUsedScriptID = GetGOInfo()->ScriptId; + LastUsedScriptID = GetScriptId(); AIM_Initialize(); if (uint32 linkedEntry = GetGOInfo()->GetLinkedGameObjectEntry()) @@ -1140,6 +1140,7 @@ bool GameObject::LoadGameObjectFromDB(ObjectGuid::LowType spawnId, Map* map, boo GOState go_state = data->go_state; uint32 artKit = data->artKit; + m_goData = data; m_spawnId = spawnId; if (!Create(map->GenerateLowGuid(), entry, map, phaseMask, x, y, z, ang, data->rotation, animprogress, go_state, artKit)) @@ -1175,8 +1176,6 @@ bool GameObject::LoadGameObjectFromDB(ObjectGuid::LowType spawnId, Map* map, boo m_respawnTime = 0; } - m_goData = data; - if (addToMap && !GetMap()->AddToMap(this)) return false; diff --git a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp index 896b77a30..b1fde6691 100644 --- a/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp +++ b/src/server/game/Scripting/ScriptDefines/PlayerScript.cpp @@ -136,7 +136,7 @@ void ScriptMgr::OnPlayerReputationRankChange(Player* player, uint32 factionID, R void ScriptMgr::OnPlayerLearnSpell(Player* player, uint32 spellID) { - CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_PLAYER_LEARN_TALENTS, script->OnLearnSpell(player, spellID)); + CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_LEARN_SPELL, script->OnLearnSpell(player, spellID)); } void ScriptMgr::OnPlayerForgotSpell(Player* player, uint32 spellID) @@ -211,7 +211,7 @@ void ScriptMgr::OnBeforePlayerUpdate(Player* player, uint32 p_time) void ScriptMgr::OnPlayerUpdate(Player* player, uint32 p_time) { - CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_BEFORE_UPDATE, script->OnUpdate(player, p_time)); + CALL_ENABLED_HOOKS(PlayerScript, PLAYERHOOK_ON_UPDATE, script->OnUpdate(player, p_time)); } void ScriptMgr::OnAfterPlayerUpdate(Player* player, uint32 diff) diff --git a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp index 564c6a75d..c74f4e088 100644 --- a/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp +++ b/src/server/scripts/EasternKingdoms/Karazhan/boss_chess_event.cpp @@ -467,7 +467,7 @@ struct npc_echo_of_medivh : public ScriptedAI break; } - if (newRow < MAX_ROW && newCol < MAX_COL && newRow >= 0 && newCol >= 0) + if (newRow < MAX_ROW && newCol < MAX_COL) if (Creature* targetPiece = ObjectAccessor::GetCreature(*me, _boards[newRow][newCol].pieceGUID)) if (!IsFriendly(piece, targetPiece)) return targetPiece;