Core/Unit: reduce differences between branches

Very partial cherry pick of:

Core/Units: Updated melee/spell hit chance calculation
(cherry picked from commit 61c7161a10)

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();