diff --git a/sql/updates/world/custom/custom_2018_07_04_02_world.sql b/sql/updates/world/custom/custom_2018_07_04_02_world.sql
new file mode 100644
index 00000000000..3f594029ca5
--- /dev/null
+++ b/sql/updates/world/custom/custom_2018_07_04_02_world.sql
@@ -0,0 +1,22 @@
+-- Harbiger of Darkness and Blaze of the Heaven
+UPDATE `creature_template` SET `DamageModifier`= 60, `BaseVariance`= 0.5 WHERE `entry` IN (43927, 48953, 48906);
+-- Frenzied Crocolisk
+UPDATE `creature_template` SET `DamageModifier`= 8, `BaseVariance`= 0.5 WHERE `entry` IN (43658, 49311);
+-- Augh (Pre-Boss)
+UPDATE `creature_template` SET `DamageModifier`= 30, `BaseVariance`= 0.5 WHERE `entry`= 45377;
+-- Servant of Siamat
+UPDATE `creature_template` SET `DamageModifier`= 30, `BaseVariance`= 0.5 WHERE `entry` IN (45259, 49256, 45268, 49257, 45269, 49258);
+-- Oathsworn Captain
+UPDATE `creature_template` SET `DamageModifier`= 60, `BaseVariance`= 0.5 WHERE `entry` IN (45122, 49334);
+-- Small Trash Groups
+UPDATE `creature_template` SET `DamageModifier`= 30, `RangeVariance`= 0.5 WHERE `entry` IN (44932, 49323, 44926, 49322);
+UPDATE `creature_template` SET `DamageModifier`= 30, `BaseVariance`= 0.5 WHERE `entry` IN (44922, 49319, 44924, 49321, 44976, 44982, 49328, 44980, 49326, 44896, 49317, 44897, 49318, 44898, 49320);
+UPDATE `creature_template` SET `DamageModifier`= 15, `BaseVariance`= 0.5 WHERE `entry` IN (44981, 49327, 44977, 49325, 44261, 49315, 45062, 49330);
+-- Sharptalon Eagle
+UPDATE `creature_template` SET `difficulty_entry_1`= 49315 WHERE `entry`= 44261;
+UPDATE `creature_template` SET `minlevel`= 85, `maxlevel`= 85, `exp`= 3, `faction`= 90, `speed_run`= 0.857143, `movementId`= 121 WHERE `entry`= 49315;
+-- Bonesnapper Scorpid
+UPDATE `creature_template` SET `difficulty_entry_1`= 49331, `minlevel`= 84, `maxlevel`= 84 WHERE `entry`= 45063;
+UPDATE `creature_template` SET `minlevel`= 85, `maxlevel`= 85, `exp`= 3, `faction`= 90 WHERE `entry`= 49331;
+-- Enslaved Bandit
+UPDATE `creature_template` SET `DamageModifier`= 4, `BaseVariance`= 0.5 WHERE `entry`= 45007;
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
index e44af49f645..2e7f7a70bbb 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
@@ -220,7 +220,7 @@ class boss_siamat : public CreatureScript
                             events.SetPhase(PHASE_2);
                             events.ScheduleEvent(EVENT_WAILING_WINDS, 1, 0, PHASE_2);
                         }
-                        else if (_deadServants < 3)
+                        else if (_lastStaticShockSpellID != SPELL_STATIC_SHOCK_3)
                             events.RescheduleEvent(EVENT_STATIC_SHOCK, Milliseconds(1));
                         break;
                     default:
@@ -259,7 +259,10 @@ class boss_siamat : public CreatureScript
                                 events.Repeat(Seconds(45));
                             }
                             else if (_lastStaticShockSpellID == SPELL_STATIC_SHOCK_2)
+                            {
                                 DoCastAOE(SPELL_STATIC_SHOCK_3);
+                                _lastStaticShockSpellID = SPELL_STATIC_SHOCK_3;
+                            }
                             break;
                         case EVENT_DEFLECTING_WINDS:
                             DoCastSelf(SPELL_DEFLECTING_WINDS, true);