From 975fd8782f138ecf43b0c634f00b7f314282b124 Mon Sep 17 00:00:00 2001
From: UltraNix <80540499+UltraNix@users.noreply.github.com>
Date: Tue, 6 Dec 2022 13:41:45 +0100
Subject: [PATCH] =?UTF-8?q?fix(DB/SAI):=20Fixed=20spam=20chat=20made=20by?=
 =?UTF-8?q?=20Coilfang=20Slavemaster=20and=20Coilfan=E2=80=A6=20(#13871)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(DB/SAI): Fixed spam chat made by Coilfang Slavemaster and Coilfang Slavehandler scripts.

Fixes #1888
---
 .../rev_1668865865289462900.sql               | 28 +++++++++++++++++++
 .../game/Spells/SpellInfoCorrections.cpp      |  7 +++++
 2 files changed, 35 insertions(+)
 create mode 100644 data/sql/updates/pending_db_world/rev_1668865865289462900.sql

diff --git a/data/sql/updates/pending_db_world/rev_1668865865289462900.sql b/data/sql/updates/pending_db_world/rev_1668865865289462900.sql
new file mode 100644
index 000000000..a1a7d09bf
--- /dev/null
+++ b/data/sql/updates/pending_db_world/rev_1668865865289462900.sql
@@ -0,0 +1,28 @@
+--
+DELETE FROM `creature_text` WHERE `CreatureID` IN (17805,17959);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17805,0,0,'Hurry up with it already! The longer you take, the more of a hurtin\ I\m putting on you!',14,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,0,1,'This is terrible..... my arms grow tired from beating on you lazy peons!',14,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,0,2,'Too soon! You are slacking off too soon!',14,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,0,3,'Wake up! Now get up and back to work!',14,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,0,4,'What is this?! Didn\t mommy and daddy teach you anything?!',14,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,1,0,'By Nazjatar\s Depths!',12,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,1,1,'Die, warmblood!',12,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,1,2,'For the Master!',12,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,1,3,'Illidan reigns!',12,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+(17805,1,4,'My blood is like venom!',12,0,100,0,0,0,0,0,'Coilfang Slavemaster'),
+
+(17959,0,0,'Hurry up with it already! The longer you take, the more of a hurtin\ I\m putting on you!',14,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,0,1,'This is terrible..... my arms grow tired from beating on you lazy peons!',14,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,0,2,'Too soon! You are slacking off too soon!',14,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,0,3,'Wake up! Now get up and back to work!',14,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,0,4,'What is this?! Didn\t mommy and daddy teach you anything?!',14,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,1,0,'By Nazjatar\s Depths!',12,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,1,1,'Die, warmblood!',12,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,1,2,'For the Master!',12,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,1,3,'Illidan reigns!',12,0,100,0,0,0,0,0,'Coilfang Slavehandler'),
+(17959,1,4,'My blood is like venom!',12,0,100,0,0,0,0,0,'Coilfang Slavehandler');
+
+UPDATE `smart_scripts` SET `event_chance`=50 WHERE `entryorguid`=17959 AND `source_type`=0 AND `id`=5;
+UPDATE `smart_scripts` SET `event_chance`=50 WHERE `entryorguid`=17805 AND `source_type`=0 AND `id`=4;
+UPDATE `smart_scripts` SET `event_chance`=50 WHERE `entryorguid`=18206 AND `source_type`=0 AND `id`=0;
diff --git a/src/server/game/Spells/SpellInfoCorrections.cpp b/src/server/game/Spells/SpellInfoCorrections.cpp
index 94f633bad..d62f556e7 100644
--- a/src/server/game/Spells/SpellInfoCorrections.cpp
+++ b/src/server/game/Spells/SpellInfoCorrections.cpp
@@ -4441,6 +4441,13 @@ void SpellMgr::LoadSpellInfoCorrections()
         spellInfo->ExcludeTargetAuraSpell = 51120;
     });
 
+    // Slap!
+    ApplySpellFix({ 6754 }, [](SpellInfo* spellInfo)
+    {
+        spellInfo->AttributesEx |= SPELL_ATTR1_NO_THREAT;
+        spellInfo->AttributesEx3 |= SPELL_ATTR3_SUPRESS_TARGET_PROCS;
+    });
+
     for (uint32 i = 0; i < GetSpellInfoStoreSize(); ++i)
     {
         SpellInfo* spellInfo = mSpellInfoMap[i];