From 40b02408c8bec6f4ef562555d7f7d1aed313672b Mon Sep 17 00:00:00 2001
From: jordan4ibanez <jordan4ibanez@gmail.com>
Date: Sun, 23 Jul 2017 18:17:51 -0400
Subject: [PATCH] Magnet works on chunk borders

---
 entity.lua | 18 ++++++++++++------
 player.lua |  2 +-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/entity.lua b/entity.lua
index e3556b6..dc491c8 100644
--- a/entity.lua
+++ b/entity.lua
@@ -284,17 +284,23 @@ end
 --magnetize items towards player
 --taken from sfan5's nuke mod in Minetest - https://forum.minetest.net/viewtopic.php?id=638
 function entity.item_magnet(i)
-	local realx = player.playerx - entity_table[i]["posx"]
-	local realy = player.playery - entity_table[i]["posy"]
-	local x = realx--math.abs(realx)
-	local y = realy--math.abs(realy)
+	local x = player.playerx - entity_table[i]["posx"]
+	local y = player.playery - entity_table[i]["posy"]
+	
+	--adjust for chunk border
+	if chunkx ~= entity_table[i]["chunkx"] then
+		x = ((entity_table[i]["chunkx"]-chunkx)*map_max-x)*-1
+	end
+	if chunky ~= entity_table[i]["chunky"] then
+		y = ((chunky-entity_table[i]["chunky"])*map_max-y)*-1
+	end
 	
 	local calc1 = x*x+y*y --optimize
 	
 	entity_table[i]["magnetized"] = false
 	
 	if calc1 <= magnet_radius * magnet_radius + magnet_radius then
-		local normalx,normaly,length = math.normalize(player.playerx-entity_table[i]["posx"],player.playery-entity_table[i]["posy"])
+		local normalx,normaly,length = math.normalize(x,y)
 		normalx,normaly = normalx*0.05,normaly*0.05
 		entity_table[i]["inertiax"] = entity_table[i]["inertiax"] + normalx
 		entity_table[i]["inertiay"] = entity_table[i]["inertiay"] + normaly
@@ -306,7 +312,7 @@ function entity.item_magnet(i)
 		--entity_table[i] = nil
 		table.remove(entity_table,i)
 		entity_count = entity_count - 1
-		print("add to inventory")
+		--print("add to inventory")
 		item_magnet_pickup:setPitch(love.math.random(80,120)/100)
 		item_magnet_pickup:stop()
 		item_magnet_pickup:play()
diff --git a/player.lua b/player.lua
index 9456e22..883cf4b 100644
--- a/player.lua
+++ b/player.lua
@@ -14,7 +14,7 @@ health = 10
 
 deaths = 0
 
-magnet_radius = 5
+magnet_radius = 2
 
 add_inventory_radius = 0.5