From 0aa213ba8965e1baf98cbfb049c1a451e1a467b1 Mon Sep 17 00:00:00 2001
From: Grimfeather <88028633+Grimfeather@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:34:27 +0200
Subject: [PATCH] Fix SI conflicts with AC update (#800)

solve conflicts with AC's version of the Scourge Invasion
---
 data/sql/world/base/si.sql             | 10 ++++++++++
 data/sql/world/base/si_creatures.sql   |  3 +++
 data/sql/world/base/si_gameobjects.sql |  3 +++
 3 files changed, 16 insertions(+)

diff --git a/data/sql/world/base/si.sql b/data/sql/world/base/si.sql
index c7c89d4..936b8ad 100644
--- a/data/sql/world/base/si.sql
+++ b/data/sql/world/base/si.sql
@@ -777,6 +777,16 @@ INSERT INTO `quest_mail_sender` (`QuestId`, `RewardMailSenderEntry`) VALUES
 (9302, @KEEPER_OF_THE_ROLLS), -- Garon Hutchins
 (9304, @KEEPER_OF_THE_ROLLS); -- Caretaker Alen
 
+DELETE FROM `creature_questender` WHERE `id` = @KEEPER_OF_THE_ROLLS AND `quest` IN (9295, 9299, 9300, 9301, 9302, 9304);
+INSERT INTO `creature_questender` (`id`, `quest`) VALUES 
+(@KEEPER_OF_THE_ROLLS, 9295),
+(@KEEPER_OF_THE_ROLLS, 9299),
+(@KEEPER_OF_THE_ROLLS, 9300),
+(@KEEPER_OF_THE_ROLLS, 9301),
+(@KEEPER_OF_THE_ROLLS, 9302),
+(@KEEPER_OF_THE_ROLLS, 9304);
+
+
 DELETE FROM `quest_template_addon` WHERE `ID` IN (9295, 9299, 9300, 9301, 9302, 9304);
 INSERT INTO `quest_template_addon` (`ID`, `MaxLevel`, `AllowableClasses`, `SourceSpellID`, `PrevQuestID`, `NextQuestID`, `ExclusiveGroup`, `RewardMailTemplateID`, `RewardMailDelay`, 
 `RequiredSkillID`, `RequiredSkillPoints`, `RequiredMinRepFaction`, `RequiredMaxRepFaction`, `RequiredMinRepValue`, `RequiredMaxRepValue`, `ProvidedItemCount`, `SpecialFlags`) VALUES
diff --git a/data/sql/world/base/si_creatures.sql b/data/sql/world/base/si_creatures.sql
index c4ea253..b86f52e 100644
--- a/data/sql/world/base/si_creatures.sql
+++ b/data/sql/world/base/si_creatures.sql
@@ -1562,6 +1562,9 @@ UPDATE `creature` SET `wander_distance` = 20, `MovementType` = 1 WHERE `id1` IN
 UPDATE `creature` SET `spawntimesecs` = 7200 WHERE `id1` IN (@NECROTIC_SHARD, @CULTIST_ENGINEER);
 UPDATE `creature` SET `spawntimesecs` = 3600 WHERE `id1` IN (@LUMBERING_HORROR, @SPIRIT_OF_THE_DAMNED, @BONE_WITCH);
 
+-- undo AC adding IP's creatures to event 17
+DELETE FROM `game_event_creature` WHERE `eventEntry` = 17 AND `guid` BETWEEN @CGUID AND @CGUID+191;
+
 -- Ghoul Berserker,       .npc add 616141
 -- Spectral Soldier,      .npc add 616298
 -- Skeletal Shocktrooper, .npc add 616299
diff --git a/data/sql/world/base/si_gameobjects.sql b/data/sql/world/base/si_gameobjects.sql
index d21f997..46c92de 100644
--- a/data/sql/world/base/si_gameobjects.sql
+++ b/data/sql/world/base/si_gameobjects.sql
@@ -135,3 +135,6 @@ INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`,
 
 
 UPDATE `gameobject` SET `ScriptName` = 'gobject_ipp_si' WHERE `guid` BETWEEN @OGUID AND @OGUID+115;
+
+-- undo AC adding IP's gameobjects to event 17
+DELETE FROM `game_event_gameobject` WHERE `eventEntry` = 17 AND `guid` BETWEEN @OGUID AND @OGUID+115;