Fixing bugs (#743)

* Saving modifiers

* Let's not use this file

* Fixed neutral kills counting as hero kills

* Fix not tping at start if the duel when casting abilities

* Revert "saving modifiers"

* Actuall use lenghtr

Author: Chronophylos

game/scripts/vscripts/components/duels/duels.lua

@@ -43,6 +43,19 @@ function Duels:Init ()
     Duels:CheckDuelStatus(keys)
   end)
 
+  GameEvents:OnPlayerReconnect(function (keys)
+    local playerID = keys.playerID
+    if playerID then
+      local hero = PlayerResource:GetSelectedHeroEntity(playerID)
+      if not Duels.currentDuel then
+        hero:SetRespawnsDisabled(false)
+        if not hero:IsAlive() then
+         hero:RespawnHero(false, false, false)
+        end
+      end
+    end
+  end)
+
   Timers:CreateTimer(1, function ()
     Duels:StartDuel()
   end)
@@ -180,8 +193,11 @@ function Duels:ActuallyStartDuel ()
     goodGuy.duelNumber = 1
     badGuy.duelNumber = 1
 
-    FindClearSpaceForUnit(goodHero, spawn1, true)
-    FindClearSpaceForUnit(badHero, spawn2, true)
+    self:SafeTeleport(goodHero, spawn1, 150)
+    self:SafeTeleport(badHero, spawn2, 150)
+    --FindClearSpaceForUnit(goodHero, spawn1, true)
+    --FindClearSpaceForUnit(badHero, spawn2, true)
+
 
     Duels.zone1.addPlayer(goodGuy.id)
     Duels.zone1.addPlayer(badGuy.id)
@@ -326,15 +342,15 @@ function Duels:ResetPlayerState (hero)
   hero:SetMana(hero:GetMaxMana())
 
   -- Reset cooldown for abilities
-  for abilityIndex = 0,hero:GetAbilityCount() - 1 do
+  for abilityIndex = 0, hero:GetAbilityCount() - 1 do
     local ability = hero:GetAbilityByIndex(abilityIndex)
     if ability ~= nil then
       ability:EndCooldown()
     end
   end
 
   -- Reset cooldown for items
-  for i = 0, 5 do
+  for i = DOTA_ITEM_SLOT_1, DOTA_ITEM_SLOT_6 do
     local item = hero:GetItemInSlot(i)
     if item  then
       item:EndCooldown()
@@ -348,6 +364,7 @@ function Duels:SavePlayerState (hero)
     abilityCount = hero:GetAbilityCount(),
     abilities = {},
     items = {},
+    modifiers = {},
     hp = hero:GetHealth(),
     mana = hero:GetMana()
   }
@@ -370,15 +387,14 @@ function Duels:SavePlayerState (hero)
     end
   end
 
-  for itemIndex = 0,5 do
+  for itemIndex = DOTA_ITEM_SLOT_1, DOTA_ITEM_SLOT_6 do
     local item = hero:GetItemInSlot(itemIndex)
     if item ~= nil then
       state.items[itemIndex] = {
         cooldown = item:GetCooldownTimeRemaining()
       }
     end
   end
-
   return state
 end
 
@@ -389,7 +405,7 @@ function Duels:RestorePlayerState (hero, state)
   end
   hero:SetMana(state.mana)
 
-  for abilityIndex = 0,hero:GetAbilityCount()-1 do
+  for abilityIndex = 0, hero:GetAbilityCount() - 1 do
     local ability = hero:GetAbilityByIndex(abilityIndex)
     if ability ~= nil then
       if state.abilities[abilityIndex] == nil then
@@ -401,7 +417,7 @@ function Duels:RestorePlayerState (hero, state)
     end
   end
 
-  for itemIndex = 0,5 do
+  for itemIndex = DOTA_ITEM_SLOT_1, DOTA_ITEM_SLOT_6 do
     local item = hero:GetItemInSlot(itemIndex)
     if item ~= nil and state.items[itemIndex] then
       item:StartCooldown(state.items[itemIndex].cooldown)
@@ -430,3 +446,13 @@ function Duels:AllPlayers (state, cb)
     end
   end
 end
+
+function Duels:SafeTeleport(unit, location, maxDistance)
+  FindClearSpaceForUnit(unit, location, true)
+  local distance = (location - unit:GetAbsOrigin()):Length2D()
+  if distance > maxDistance then
+    Timers:CreateTimer(0.1, function()
+      self:SafeTeleport(unit, location, maxDistance)
+    end)
+  end
+end

game/scripts/vscripts/components/points/points.lua

@@ -18,7 +18,7 @@ function PointsManager:Init ()
 
   GameEvents:OnHeroKilled(function (keys)
     -- increment points
-    if keys.killer:GetTeam() ~= keys.killed:GetTeam() and not keys.killed:IsReincarnating() then
+    if keys.killer:GetTeam() ~= keys.killed:GetTeam() and not keys.killed:IsReincarnating() and keys.killed:GetTeam() ~= DOTA_TEAM_NEUTRALS then
       self:AddPoints(keys.killer:GetTeam())
     end
   end)

game/scripts/vscripts/events.lua

@@ -114,13 +114,6 @@ function GameMode:OnPlayerReconnect(keys)
     return
   end
 
-  local hero = PlayerResource:GetSelectedHeroEntity(playID)
-  if not Duels.currentDuel then
-    hero:SetRespawnsDisabled(false)
-    if not hero:IsAlive() then
-     hero:RespawnHero(false,false,false)
-    end
-  end
 end
 
 -- An item was purchased by a player