nalc/nether-pack
1
0
Fork 0
forked from mtcontrib/nether-pack
Code Issues Pull Requests Releases Wiki Activity

untested: save known opposite portal y to meta

Browse Source
This commit is contained in:
HybridDog
2016-01-04 12:00:35 +01:00
parent b8f81b71bc
commit 041f1ce21a
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
nether/portal.lua
View File

@@ -104,7 +104,11 @@ local function player_to_nether(player, safe)
players_in_nether[#players_in_nether+1] = pname players_in_nether[#players_in_nether+1] = pname
save_nether_players() save_nether_players()
if not safe then if not safe then
obsidian_teleport(player, pname) minetest.chat_send_player(pname, "For any reason you arrived here. Type /nether_help to find out things like craft recipes.")
player:set_hp(0)
if not nether_prisons then
player:moveto(get_player_died_target(player))
end
end end
update_background(player, true) update_background(player, true)
end end
@@ -576,18 +580,18 @@ end
-- detects if it's a portal -- detects if it's a portal
local function netherport(pos) local function netherport(pos)
local x, y, z = pos.x, pos.y, pos.z local x, y, z = pos.x, pos.y, pos.z
for _,i in ipairs({-1, 3}) do for _,i in pairs({-1, 3}) do
if minetest.get_node({x=x, y=y+i, z=z}).name ~= "nether:white" then if minetest.get_node({x=x, y=y+i, z=z}).name ~= "nether:white" then
return return
end end
end end
for _,sn in ipairs(vector.square(1)) do for _,sn in pairs(vector.square(1)) do
if minetest.get_node({x=x+sn[1], y=y-1, z=z+sn[2]}).name ~= "nether:netherrack" if minetest.get_node({x=x+sn[1], y=y-1, z=z+sn[2]}).name ~= "nether:netherrack"
or minetest.get_node({x=x+sn[1], y=y+3, z=z+sn[2]}).name ~= "nether:blood_cooked" then or minetest.get_node({x=x+sn[1], y=y+3, z=z+sn[2]}).name ~= "nether:blood_cooked" then
return return
end end
end end
for _,sn in ipairs(vector.square(2)) do for _,sn in pairs(vector.square(2)) do
if minetest.get_node({x=x+sn[1], y=y-1, z=z+sn[2]}).name ~= "nether:netherrack_black" if minetest.get_node({x=x+sn[1], y=y-1, z=z+sn[2]}).name ~= "nether:netherrack_black"
or minetest.get_node({x=x+sn[1], y=y+3, z=z+sn[2]}).name ~= "nether:wood_empty" then or minetest.get_node({x=x+sn[1], y=y+3, z=z+sn[2]}).name ~= "nether:wood_empty" then
return return
@@ -641,14 +645,37 @@ function nether_port(player, pos)
return return
end end
minetest.sound_play("nether_teleporter", {pos=pos}) minetest.sound_play("nether_teleporter", {pos=pos})
local meta = minetest.get_meta({x=pos.x, y=pos.y-1, z=pos.z})
if pos.y < nether.start then if pos.y < nether.start then
set_portal(known_portals_d, pos.z,pos.x, pos.y) set_portal(known_portals_d, pos.z,pos.x, pos.y)
player_from_nether(player) player_from_nether(player)
pos.y = get_portal(known_portals_u, pos.z,pos.x) or 100
local my = tonumber(meta:get_string("y"))
local y = get_portal(known_portals_u, pos.z,pos.x)
if y then
if y ~= my then
meta:set_string("y", y)
end
else
y = my or 100
end
pos.y = y
player:moveto(pos) player:moveto(pos)
else else
set_portal(known_portals_u, pos.z,pos.x, pos.y) set_portal(known_portals_u, pos.z,pos.x, pos.y)
pos.y = get_portal(known_portals_d, pos.z,pos.x) or portal_target+math.random(4)
local my = tonumber(meta:get_string("y"))
local y = get_portal(known_portals_d, pos.z,pos.x)
if y then
if y ~= my then
meta:set_string("y", y)
end
else
y = my or portal_target+math.random(4)
end
pos.y = y
player:moveto(pos) player:moveto(pos)
player_to_nether(player, true) player_to_nether(player, true)
end end