Merge branch 'master' of github.com:zygzagZ/otclient-candybot

zygzagZ · Feb 20, 2017 · 4c44d5c · 4c44d5c
2 parents de94e44 + 68926fc
commit 4c44d5c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/modules/02-support/events/healthrestore.lua b/modules/02-support/events/healthrestore.lua
@@ -26,17 +26,21 @@ function AutoHeal.onHealthChange(player, health, maxHealth, oldHealth, restoreTy
       g_game.talk(spellText)
       delay = Helper.getSpellDelay(spellText)
     end
-
+    if nextHeal[RestoreType.cast] ~= nil then
+    	removeEvent(nextHeal[RestoreType.cast])
+    end
     nextHeal[RestoreType.cast] = scheduleEvent(function()
       local player = g_game.getLocalPlayer()
       if not player then return end
 
       health, maxHealth = player:getHealth(), player:getMaxHealth()
       if player:getHealthPercent() < healthValue and tries > 0 then
         tries = tries - 1
+        nextHeal[RestoreType.cast] = nil
         AutoHeal.onHealthChange(player, health, maxHealth, health, restoreType, tries) 
       else
         removeEvent(nextHeal[RestoreType.cast])
+        nextHeal[RestoreType.cast] = nil
       end
     end, delay)
 
@@ -54,16 +58,20 @@ function AutoHeal.onHealthChange(player, health, maxHealth, oldHealth, restoreTy
     if player:getHealthPercent() < healthValue then
       Helper.safeUseInventoryItemWith(item:getId(), player, BotModule.isPrecisionMode())
     end
-
-    nextHeal[RestoreType.item] = scheduleEvent(function()
+    if nextHeal[RestoreType.item] ~= nil then
+    	removeEvent(nextHeal[RestoreType.item])
+    end
+	nextHeal[RestoreType.item] = scheduleEvent(function()
       local player = g_game.getLocalPlayer()
       if not player then return end
       health, maxHealth = player:getHealth(), player:getMaxHealth()
       if player:getHealthPercent() < healthValue and tries > 0 then
         tries = tries - 1
+        nextHeal[RestoreType.item] = nil
         AutoHeal.onHealthChange(player, health, maxHealth, health, restoreType, tries) 
       else
         removeEvent(nextHeal[RestoreType.item])
+        nextHeal[RestoreType.item] = nil
       end
     end, delay)
   end

diff --git a/modules/02-support/events/manarestore.lua b/modules/02-support/events/manarestore.lua
@@ -28,19 +28,24 @@ function AutoMana.onManaChange(player, mana, maxMana, oldMana, restoreType, trie
     local delay = Helper.getItemUseDelay()
 
     if player:getManaPercent() < manaValue then
+    	print('restore')
       Helper.safeUseInventoryItemWith(item:getId(), player, BotModule.isPrecisionMode())
     end
-
+    if nextMana then
+    	removeEvent(nextMana)
+    end
     nextMana = scheduleEvent(function()
       local player = g_game.getLocalPlayer()
       if not player then return end
 
       mana, maxMana = player:getMana(), player:getMaxMana()
       if player:getManaPercent() < manaValue and tries > 0 then
         tries = tries - 1
+        nextMana = nil
         AutoMana.onManaChange(player, mana, maxMana, mana, restoreType, tries) 
       else
         removeEvent(nextMana)
+        nextMana = nil
       end
     end, delay)
   end