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

1 files changed, 49 insertions, 25 deletions

diff --git a/luaentity.lua b/luaentity.lua
index 665e055..ab7280c 100644
--- a/luaentity.lua
+++ b/luaentity.lua
@@ -1,6 +1,7 @@
 local max_entity_id = 1000000000000 -- If you need more, there's a problem with your code
 
-luaentity = {}
+local luaentity = {}
+pipeworks.luaentity = luaentity
 
 luaentity.registered_entities = {}
 
@@ -23,6 +24,22 @@ end
 local function read_entities()
 	local t = read_file()
 	for _, entity in pairs(t) do
+
+		local x=entity.start_pos.x
+		local y=entity.start_pos.y
+		local z=entity.start_pos.z
+
+		x=math.max(-30912,x)
+		y=math.max(-30912,y)
+		z=math.max(-30912,z)
+		x=math.min(30927,x)
+		y=math.min(30927,y)
+		z=math.min(30927,z)
+
+		entity.start_pos.x = x                 
+		entity.start_pos.y = y
+		entity.start_pos.z = z
+
 		setmetatable(entity, luaentity.registered_entities[entity.name])
 	end
 	return t
@@ -52,32 +69,27 @@ local function get_blockpos(pos)
 end
 
 local active_blocks = {} -- These only contain active blocks near players (i.e., not forceloaded ones)
-local handle_active_blocks_step = 2
-local handle_active_blocks_timer = 0
-minetest.register_globalstep(function(dtime)
-	handle_active_blocks_timer = handle_active_blocks_timer + dtime
-	if handle_active_blocks_timer >= handle_active_blocks_step then
-		handle_active_blocks_timer = handle_active_blocks_timer - handle_active_blocks_step
-		local active_block_range = tonumber(minetest.setting_get("active_block_range")) or 2
-		local new_active_blocks = {}
-		for _, player in ipairs(minetest.get_connected_players()) do
-			local blockpos = get_blockpos(player:getpos())
-			local minp = vector.subtract(blockpos, active_block_range)
-			local maxp = vector.add(blockpos, active_block_range)
 
-			for x = minp.x, maxp.x do
-			for y = minp.y, maxp.y do
-			for z = minp.z, maxp.z do
-				local pos = {x = x, y = y, z = z}
-				new_active_blocks[minetest.hash_node_position(pos)] = pos
-			end
-			end
-			end
+local move_entities_globalstep_part1 = function(dtime)
+	local active_block_range = tonumber(minetest.setting_get("active_block_range")) or 2
+	local new_active_blocks = {}
+	for _, player in ipairs(minetest.get_connected_players()) do
+		local blockpos = get_blockpos(player:getpos())
+		local minp = vector.subtract(blockpos, active_block_range)
+		local maxp = vector.add(blockpos, active_block_range)
+
+		for x = minp.x, maxp.x do
+		for y = minp.y, maxp.y do
+		for z = minp.z, maxp.z do
+			local pos = {x = x, y = y, z = z}
+			new_active_blocks[minetest.hash_node_position(pos)] = pos
+		end
+		end
 		end
-		active_blocks = new_active_blocks
-		-- todo: callbacks on block load/unload
 	end
-end)
+	active_blocks = new_active_blocks
+	-- todo: callbacks on block load/unload
+end
 
 local function is_active(pos)
 	return active_blocks[minetest.hash_node_position(get_blockpos(pos))] ~= nil
@@ -309,7 +321,7 @@ function luaentity.get_objects_inside_radius(pos, radius)
 	end
 end
 
-minetest.register_globalstep(function(dtime)
+local move_entities_globalstep_part2 = function(dtime)
 	if not luaentity.entities then
 		luaentity.entities = read_entities()
 	end
@@ -348,4 +360,16 @@ minetest.register_globalstep(function(dtime)
 			end
 		end
 	end
+end
+
+local handle_active_blocks_step = 0.2
+local handle_active_blocks_timer = 0.1
+
+minetest.register_globalstep(function(dtime)
+	handle_active_blocks_timer = handle_active_blocks_timer + dtime
+	if handle_active_blocks_timer >= handle_active_blocks_step then
+		handle_active_blocks_timer = handle_active_blocks_timer - handle_active_blocks_step
+		move_entities_globalstep_part1(dtime)
+		move_entities_globalstep_part2(dtime)
+	end
 end)