From 3e56f75d7c7b275d92338f13ef3815e028902082 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sun, 1 Aug 2021 15:31:15 +0200 Subject: [PATCH] fixed build and a typo in recent sql file --- sql/updates/world/4.3.4/2021_08_01_00_world.sql | 2 -- .../scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp | 2 +- src/server/scripts/Kalimdor/zone_mulgore.cpp | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sql/updates/world/4.3.4/2021_08_01_00_world.sql b/sql/updates/world/4.3.4/2021_08_01_00_world.sql index 8b14186bb4..3bacad3eec 100644 --- a/sql/updates/world/4.3.4/2021_08_01_00_world.sql +++ b/sql/updates/world/4.3.4/2021_08_01_00_world.sql @@ -146,8 +146,6 @@ UPDATE `quest_template_addon` SET `PrevQuestID`= 14458, `NextQuestID`= 0, `Exclu UPDATE `quest_template_addon` SET `PrevQuestID`= 14455, `NextQuestID`= 14460, `ExclusiveGroup`= -14461 WHERE `ID` IN (14461, 14459); UPDATE `quest_template_addon` SET `PrevQuestID`= 0, `NextQuestID`= 0 WHERE `ID`= 14460; -DELETE FROM `conditions` WHERE `SourceEntry`= 69228 AND `SourceTypeOrReferenceId`= 13; - DELETE FROM `creature` WHERE `guid` IN (294783, 294784, 294786, 294790, 294791, 294796, 294797, 294798, 294799, 294800, 294805, 294806, 294807, 294808, 294811, 294812, 294813, 294815, 294824, 294829, 294835, 294836, 294839, 294841, 294843, 294844, 294849, 295882, 295883, 295884, 295885, 295886, 295887, 295888, 295889, 295890, 295894, 295895, 295896, 295898, 295899, 295901, 295902, 295903, 295904, 295905, 295906, 295907, 295909, 295910, 295911, 295913, 295914, 295915, 295916, 295917, 295918, 295919, 295920, 295921, 295923, 295924, 295925, 295928, 295929, 295930, 295932); DELETE FROM `creature_addon` WHERE `guid` IN (294783, 294784, 294786, 294790, 294791, 294796, 294797, 294798, 294799, 294800, 294805, 294806, 294807, 294808, 294811, 294812, 294813, 294815, 294824, 294829, 294835, 294836, 294839, 294841, 294843, 294844, 294849, 295882, 295883, 295884, 295885, 295886, 295887, 295888, 295889, 295890, 295894, 295895, 295896, 295898, 295899, 295901, 295902, 295903, 295904, 295905, 295906, 295907, 295909, 295910, 295911, 295913, 295914, 295915, 295916, 295917, 295918, 295919, 295920, 295921, 295923, 295924, 295925, 295928, 295929, 295930, 295932); diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index a5ee34770b..62c0dc17bb 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -142,7 +142,7 @@ class instance_deadmines : public InstanceMapScript _ropesSpawned = false; } - void OnPlayerEnter(Player* player) override + void OnPlayerEnter(Player* /*player*/) override { instance->LoadGrid(-205.75f, -579.09f); if (!_cookieSpawnChecked) diff --git a/src/server/scripts/Kalimdor/zone_mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index ebb1d04fb2..53ea84f390 100644 --- a/src/server/scripts/Kalimdor/zone_mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp @@ -18,6 +18,7 @@ #include "ScriptMgr.h" #include "MotionMaster.h" #include "ScriptedCreature.h" +#include "SpellInfo.h" enum EagleSpirit { @@ -96,7 +97,7 @@ struct npc_mulgore_captured_brave : public ScriptedAI _events.ScheduleEvent(EVENT_TALK_FREED, 3s + 600ms); } - void UpdateAI(uint32 diff) + void UpdateAI(uint32 diff) override { _events.Update(diff);