Merge pull request #14728 from kelno/fixes

Core/SAI: Fixed a math error overflow in SmartScript::DecPhase(int32) (cherry picked from commit 6d7339e7a3daf302d6bed1c8c0a4584a69a9316b)
2015-06-26 03:27:54 +01:00
parent 7ee455df59
commit e4e903ba95
1 changed files with 8 additions and 1 deletions
@@ -246,7 +246,14 @@ class SmartScript
                DecPhase(abs(p));
        }

-        void DecPhase(int32 p = 1) { mEventPhase  -= (mEventPhase < (uint32)p ? (uint32)p - mEventPhase : (uint32)p); }
+        void DecPhase(int32 p = 1) 
+        { 
+            if(mEventPhase > (uint32)p)
+                mEventPhase -= (uint32)p; 
+            else
+                mEventPhase = 0;
+        }
+
        bool IsInPhase(uint32 p) const { return ((1 << (mEventPhase - 1)) & p) != 0; }
        void SetPhase(uint32 p = 0) { mEventPhase = p; }