Merge branch 'azerothcore:master' into Playerbot

2026-01-29 00:23:48 +00:00 · 2022-06-08 11:10:38 -06:00
parent 427f0afaaf c0ab2ab08e
commit d8a2665867
32 changed files with 2341 additions and 744 deletions
--- a/src/server/game/Entities/Player/Player.h
+++ b/src/server/game/Entities/Player/Player.h
@@ -2949,7 +2949,15 @@ template <class T> T Player::ApplySpellMod(uint32 spellId, SpellModOp op, T& bas
                return;
            }

-            totalflat += mod->value;
+            int32 flatValue = mod->value;
+
+            // SPELL_MOD_THREAT - divide by 100 (in packets we send threat * 100)
+            if (mod->op == SPELLMOD_THREAT)
+            {
+                flatValue /= 100;
+            }
+
+            totalflat += flatValue;
        }
        else if (mod->type == SPELLMOD_PCT)
        {