diff options
| author | Shauren <shauren.trinity@gmail.com> | 2015-11-10 17:33:36 +0100 |
|---|---|---|
| committer | ariel- <ariel-@users.noreply.github.com> | 2017-03-06 21:37:46 -0300 |
| commit | a1b622e9ccf78738fc8d16dac36fc97218bc6ff2 (patch) | |
| tree | 7301011fbc973c0a40d948903e7544472d2f6cbb /src/server/scripts | |
| parent | b2fc4c65eda779f880d9fc126d8b7aaef8c2ab25 (diff) | |
Core/Unit: reduce differences between branches
Very partial cherry pick of:
Core/Units: Updated melee/spell hit chance calculation
(cherry picked from commit 61c7161a1069f93948b8b4d80b501d9358b4844c)
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/World/npcs_special.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index fa9575f72e3..d5901632ff1 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1541,6 +1541,7 @@ public: void Reset() override { + // TODO: solve this in a different way! setting them as stunned prevents dummies from parrying me->SetControlled(true, UNIT_STATE_STUNNED);//disable rotate _events.Reset(); |