Fix Morphling interaction with Sohei Dash (#2261)

Author: carlosrpg

game/scripts/vscripts/abilities/sohei/sohei_dash.lua

@@ -21,9 +21,13 @@ if IsServer() then
 		if not modifier_charges then
 			modifier_charges = caster:AddNewModifier( self:GetCaster(), self, "modifier_sohei_dash_charges", {} )
 			modifier_charges:SetStackCount( chargesMax )
-		elseif modifier_charges:GetStackCount() < chargesMax then
+    elseif modifier_charges:GetStackCount() < chargesMax then
+      -- Reset the cooldown on the modifier
 			modifier_charges:SetDuration( self:GetChargeRefreshTime(), true )
-			modifier_charges:StartIntervalThink( 0.1 )
+      modifier_charges:StartIntervalThink( 0.1 )
+      if modifier_charges:GetStackCount() < 1 then
+        self:StartCooldown( modifier_charges:GetRemainingTime() )
+      end
 		end
 	end
 
@@ -76,16 +80,28 @@ if IsServer() then
 		self:EndCooldown()
 
 		if modifier_charges and not modifier_charges:IsNull() then
-			-- Perform the dash if there is at least one charge remaining
-			if modifier_charges:GetStackCount() >= 1 then
-				modifier_charges:SetStackCount( modifier_charges:GetStackCount() - 1 )
-
-				local shortCD = dashDistance / dashSpeed
-				if self:GetCooldownTimeRemaining() < shortCD then
-					self:EndCooldown()
-					self:StartCooldown( dashDistance / dashSpeed )
-				end
-			end
+      -- Perform the dash if there is at least one charge remaining
+      local currentStackCount = modifier_charges:GetStackCount()
+			if currentStackCount >= 1 then
+        if currentStackCount > 1 then
+          -- enable short cooldown if has enough charges for the next dash
+          local shortCD = dashDistance / dashSpeed
+          if self:GetCooldownTimeRemaining() < shortCD then
+            self:EndCooldown()
+            self:StartCooldown( dashDistance / dashSpeed )
+          end
+        else
+          -- if does not have charges for the next dash, set the cd to the remain time of the modifier
+          self:StartCooldown( modifier_charges:GetRemainingTime() )
+        end
+        modifier_charges:SetStackCount( currentStackCount - 1 )
+      else
+        -- should not enter here, but if it does :
+        -- set the cd to the remain time of the modifier
+        self:StartCooldown( modifier_charges:GetRemainingTime() )
+        -- and return without performing the spell action (this will still consume resources)
+        return
+      end
 		else
 			caster:AddNewModifier( caster, self, "modifier_sohei_dash_charges", {
 				duration = self:GetChargeRefreshTime()