Build fix and misc

KamiliaBlow · Dec 28, 2024 · 2d39077 · 2d39077
1 parent 2971ea0
commit 2d39077
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 17 deletions.
diff --git a/src/server/game/LuaEngine/methods/TrinityCore/UnitMethods.h b/src/server/game/LuaEngine/methods/TrinityCore/UnitMethods.h
@@ -2413,7 +2413,7 @@ namespace LuaUnit
         if (school == MAX_SPELL_SCHOOL)
         {
             Unit::DealDamage(unit, target, damage, NULL, DIRECT_DAMAGE, SPELL_SCHOOL_MASK_NORMAL, NULL, durabilityloss);
-            unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_HIT, 0);
+            unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 1, SPELL_SCHOOL_MASK_NORMAL, damage, 0, 0, VICTIMSTATE_HIT, 0, 0);
             return 0;
         }
 
@@ -2438,7 +2438,7 @@ namespace LuaUnit
             unit->DealDamageMods(unit, target, damage, &absorb);
 
             Unit::DealDamage(unit, target, damage, NULL, DIRECT_DAMAGE, schoolmask, NULL, false);
-            unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 0, schoolmask, damage, absorb, resist, VICTIMSTATE_HIT, 0);
+            unit->SendAttackStateUpdate(HITINFO_AFFECTS_VICTIM, target, 0, schoolmask, damage, absorb, resist, VICTIMSTATE_HIT, 0, 0);
             return 0;
         }
 

diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
@@ -1578,7 +1578,6 @@ class spell_warl_fear : public SpellScriptLoader
 
     class spell_warl_fear_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_warl_fear_SpellScript);
 
         bool  Validate(SpellInfo const* /*spellInfo*/) override
         {
@@ -1622,7 +1621,6 @@ class spell_warl_fear_buff : public SpellScriptLoader
 
     class spell_warl_fear_buff_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_warl_fear_buff_SpellScript);
 
         bool  Validate(SpellInfo const* /*spellInfo*/) override
         {
@@ -1656,7 +1654,6 @@ class spell_warl_fear_buff : public SpellScriptLoader
 //146739 - Corruption effect
 class spell_warl_corruption_effect : public AuraScript
 {
-    PrepareAuraScript(spell_warl_corruption_effect);
 
     bool  Validate(SpellInfo const* /*spellInfo*/) override
     {
@@ -1756,7 +1753,6 @@ class aura_warl_phantomatic_singularity : public AuraScript
 // 48181 - Haunt
 class aura_warl_haunt : public AuraScript
 {
-    PrepareAuraScript(aura_warl_haunt);
 
     void HandleRemove(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
     {
@@ -1836,7 +1832,6 @@ class spell_warlock_unending_breath : public SpellScriptLoader
 
     class spell_warlock_unending_breath_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_warlock_unending_breath_SpellScript);
 
         void HandleHit(SpellEffIndex effIndex)
         {
@@ -2028,7 +2023,6 @@ class npc_warl_demonic_gateway : public CreatureScript
 // Hand of Gul'Dan - 105174
 class spell_warl_hand_of_guldan : public SpellScript
 {
-    PrepareSpellScript(spell_warl_hand_of_guldan);
 
     void HandleOnHit()
     {
@@ -2065,7 +2059,6 @@ class spell_warl_hand_of_guldan_damage : public SpellScriptLoader
 
     class spell_warl_hand_of_guldan_damage_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_warl_hand_of_guldan_damage_SpellScript);
 
     public:
         spell_warl_hand_of_guldan_damage_SpellScript()
@@ -2280,7 +2273,6 @@ class spell_warlock_demonbolt_new : public SpellScriptLoader
 
     class spell_warlock_demonbolt_new_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_warlock_demonbolt_new_SpellScript);
 
         void HandleHit(SpellEffIndex /*effIndex*/)
         {
@@ -2417,7 +2409,6 @@ class spell_warlock_doom : public SpellScriptLoader
 
     class spell_warlock_doom_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warlock_doom_AuraScript);
 
         void PeriodicTick(AuraEffect const* aurEff)
         {
@@ -2453,7 +2444,6 @@ class spell_warlock_soul_fire : public SpellScriptLoader
 
     class spell_warlock_soul_fire_SpellScript : public SpellScript
     {
-        PrepareSpellScript(spell_warlock_soul_fire_SpellScript);
 
         void HandleHit(SpellEffIndex /*effIndex*/)
         {
@@ -2524,7 +2514,6 @@ class spell_warl_soul_conduit : public SpellScriptLoader
 
     class spell_warl_soul_conduit_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_soul_conduit_AuraScript);
 
         int32 refund = 0;
 
@@ -2576,7 +2565,6 @@ class spell_warl_soul_conduit : public SpellScriptLoader
 //232670
 class spell_warr_shadowbolt_affliction : public SpellScript
 {
-    PrepareSpellScript(spell_warr_shadowbolt_affliction);
 
     void HandleOnHit()
     {
@@ -2714,7 +2702,6 @@ class spell_warlock_inquisitors_gaze : public SpellScript
 // Incinerate - 29722
 class spell_warl_incinerate : public SpellScript
 {
-    PrepareSpellScript(spell_warl_incinerate);
 
     void HandleOnHitMainTarget(SpellEffIndex /*effIndex*/)
     {

diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
@@ -1578,14 +1578,14 @@ class spell_warr_odyns_fury : public SpellScriptLoader
     class spell_warr_odyns_fury_AuraScript : public AuraScript
     {
 
-        void Absorb(AuraEffect* /* aurEff */, DamageInfo& /*dmgInfo*/, uint32& absorbAmount)
+        void Absorb(AuraEffect* /*aurEff*/, DamageInfo& /*dmgInfo*/, uint32& absorbAmount)
         {
             absorbAmount = 0;
         }
 
         void Register() override
         {
-            OnEffectAbsorb += AuraEffectAbsorbFn(spell_warr_odyns_fury_AuraScript::Absorb, EFFECT_0, SPELL_AURA_DUMMY);
+            OnEffectAbsorb += AuraEffectAbsorbFn(spell_warr_odyns_fury_AuraScript::Absorb, EFFECT_0);
         }
     };