From a1b622e9ccf78738fc8d16dac36fc97218bc6ff2 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Tue, 10 Nov 2015 17:33:36 +0100
Subject: Core/Unit: reduce differences between branches

Very partial cherry pick of:

Core/Units: Updated melee/spell hit chance calculation
(cherry picked from commit 61c7161a1069f93948b8b4d80b501d9358b4844c)
---
 src/server/scripts/World/npcs_special.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/server/scripts')

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();
-- 
cgit v1.2.3