Merge branch 'master' of https://github.com/minetest-mods/pipeworks

1 files changed, 19 insertions, 1 deletions

diff --git a/teleport_tube.lua b/teleport_tube.lua
index bb364db..d707717 100644
--- a/teleport_tube.lua
+++ b/teleport_tube.lua
@@ -4,7 +4,7 @@ local tp_tube_db = nil -- nil forces a read
 local tp_tube_db_version = 2.0
 
 local function hash(pos)
-	return string.format("%d", minetest.hash_node_position(pos))
+	return string.format("%.30g", minetest.hash_node_position(pos))
 end
 
 local function save_tube_db()
@@ -50,6 +50,11 @@ local function read_tube_db()
 	return tp_tube_db
 end
 
+-- debug formatter for coordinates used below
+local fmt = function(pos)
+	return pos.x..", "..pos.y..", "..pos.z
+end
+
 -- updates or adds a tube
 local function set_tube(pos, channel, can_receive)
 	local tubes = tp_tube_db or read_tube_db()
@@ -63,6 +68,19 @@ local function set_tube(pos, channel, can_receive)
 	end
 
 	-- we haven't found any tp tube to update, so lets add it
+	-- but sanity check that the hash has not already been inserted.
+	-- if so, complain very loudly and refuse the update so the player knows something is amiss.
+	-- to catch regressions of https://github.com/minetest-mods/pipeworks/issues/166
+	local existing = tp_tube_db[hash]
+	if  existing ~= nil then
+		local e = "error"
+		minetest.log(e, "pipeworks teleport tube update refused due to position hash collision")
+		minetest.log(e, "collided hash: "..hash)
+		minetest.log(e, "tried-to-place tube: "..fmt(pos))
+		minetest.log(e, "existing tube: "..fmt(existing))
+		return
+	end
+
 	tp_tube_db[hash] = {x=pos.x,y=pos.y,z=pos.z,channel=channel,cr=can_receive}
 	save_tube_db()
 end