Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-12-23 00:19:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix aggressive 2nd removal after portal generation

Browse source
This commit is contained in:
Wuzzy 2017-08-21 04:30:29 +02:00
parent abc6352471
commit 5302a92baa
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
mods/ITEMS/mcl_portals/portal_nether.lua
View file

@ -128,7 +128,7 @@ minetest.register_node("mcl_portals:portal", {
-- Functions -- Functions
--Build arrival portal --Build arrival portal
local function build_portal(pos, target) local function build_portal(pos, target, is_rebuilding)
local p = {x = pos.x - 1, y = pos.y - 1, z = pos.z} local p = {x = pos.x - 1, y = pos.y - 1, z = pos.z}
local p1 = {x = pos.x - 1, y = pos.y - 1, z = pos.z} local p1 = {x = pos.x - 1, y = pos.y - 1, z = pos.z}
local p2 = {x = p1.x + 3, y = p1.y + 4, z = p1.z} local p2 = {x = p1.x + 3, y = p1.y + 4, z = p1.z}
@ -163,7 +163,7 @@ local function build_portal(pos, target)
meta:set_string("portal_target", minetest.pos_to_string(target)) meta:set_string("portal_target", minetest.pos_to_string(target))
end end
if y ~= p1.y then if y ~= p1.y and not is_rebuilding then
for z = -2, 2 do for z = -2, 2 do
if z ~= 0 then if z ~= 0 then
p.z = p.z + z p.z = p.z + z
@ -397,17 +397,21 @@ minetest.register_abm({
end end
-- Build target portal -- Build target portal
local function check_and_build_portal(pos, target) local function check_and_build_portal(pos, target, is_rebuilding)
-- FIXME: This is a horrible hack and a desparate attempt to make sure
-- the portal has *really* been placed. Replace this hack!
local n = minetest.get_node_or_nil(target) local n = minetest.get_node_or_nil(target)
if n and n.name ~= "mcl_portals:portal" then if n and n.name ~= "mcl_portals:portal" then
build_portal(target, pos) build_portal(target, pos, is_rebuilding)
minetest.after(2, check_and_build_portal, pos, target) is_rebuilding = true
minetest.after(2, check_and_build_portal, pos, target, is_rebuilding)
elseif not n then elseif not n then
minetest.after(1, check_and_build_portal, pos, target) is_rebuilding = true
minetest.after(1, check_and_build_portal, pos, target, is_rebuilding)
end end
end end
check_and_build_portal(pos, target) check_and_build_portal(pos, target, false)
-- Teleport -- Teleport
obj:setpos(target) obj:setpos(target)