Serveral Fixes

diff --git a/init.lua b/init.lua
index aa44da164d241f317908e5b07d1bdcc97840b72b..337212beb9307a634dee45654ba5d308e64186d7 100755 (executable)
--- a/init.lua
+++ b/init.lua
@@ -1,6 +1,6 @@
 elidragon = {}
 
-local modules = {"functions", "nodes", "commands", "ranks", "tags", "warps", "misc", "patches", "birthday", "skyblock"}
+local modules = {"functions", "nodes", "commands", "ranks", "tags", "warps", "misc", "birthday", "skyblock"}
 
 local modpath = minetest.get_modpath("elidragon")
 

diff --git a/misc.lua b/misc.lua
index 0cce86f0878ce2fe1c82585ca0f6c8907f0ac9ad..57c5db2526eea88aa43de2e22d12f03c3266331a 100755 (executable)
--- a/misc.lua
+++ b/misc.lua
@@ -30,3 +30,5 @@ minetest.register_tool("elidragon:stick", {
 })
 
 minetest.register_alias("elidragon_server:god_stick", "elidragon:stick")
+
+minetest.register_alias_force("default:sign_yard", "default:sign_wood_yard")

diff --git a/nodes.lua b/nodes.lua
index 8a7faa1c4cc9baaa63a750285692b32edd67a860..1046cff11781f42b6d867c96f1a8179abcd088f1 100755 (executable)
--- a/nodes.lua
+++ b/nodes.lua
@@ -10,6 +10,7 @@ local nodes = {
     {"Olliy", "elidragon_olliy.png", "o"},
     {"Skyblock", "elidragon_skyblock.png", "sky"},
     {"Python", "default_rainforest_litter.png^elidragon_python.png", "py"},
+    {"Tux", "default_ice.png^elidragon_tux.png", "tux"},
 }
 for _, def in pairs(nodes) do
     local name = "elidragon:" .. string.lower(def[1]):gsub("+", "p"):gsub(" ", "_")

diff --git a/patches.lua b/patches.lua
deleted file mode 100755 (executable)
index 8b5c5d2..0000000
--- a/patches.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-minetest.register_alias_force("default:sign_yard", "default:sign_wood_yard")
-local old_is_protected = minetest.is_protected
-function minetest.is_protected(pos, player)
-       if pos.y <= -7 then
-               return true
-       else
-               return old_is_protected(pos, player)
-       end     
-end
-minetest.register_abm({
-       nodenames = {"air"},
-       neighbors = {"default:cloud"},
-       interval = 1,
-       chance = 1,
-       action = function(pos, node, active_object_count, active_object_count_wider)
-        if pos.y == -10 then
-            minetest.set_node({x = pos.x, y = pos.y, z = pos.z}, {name = "default:cloud"})
-        end
-       end
-})

diff --git a/skyblock.lua b/skyblock.lua
index efc07715c1af074b848dfad76212547570a7c514..2ce5fd2e6479484ac18aafd0f686bfc3d5ae2c82 100644 (file)
--- a/skyblock.lua
+++ b/skyblock.lua
@@ -83,14 +83,18 @@ function elidragon.skyblock.set_spawn(name, pos)
 end
 
 function elidragon.skyblock.spawn_player(player)
+       if not player then return end
        local name = player:get_player_name()
        local spawn = elidragon.skyblock.get_spawn(name) or elidragon.skyblock.new_spawn(name)
        player:set_pos({x = spawn.x + 2, y = spawn.y + 2, z = spawn.z + 2})
 end
 
 function elidragon.skyblock.new_spawn(name)
-       elidragon.savedata.last_start_id = elidragon.savedata.last_start_id + 1
-       local spawn = elidragon.start_positions[elidragon.savedata.last_start_id] 
+       local spawn
+       repeat
+               elidragon.savedata.last_start_id = elidragon.savedata.last_start_id + 1
+               spawn = elidragon.start_positions[elidragon.savedata.last_start_id] 
+       until not minetest.is_protected(spawn, name)
        elidragon.skyblock.set_spawn(name, spawn)       
        local file = io.open(minetest.get_modpath("elidragon") .. "/schems/island.we", "r")
        local schem = file:read()
@@ -167,11 +171,9 @@ end)
 
 -- remove legacy cloud layer
 
-minetest.register_abm({
-       name = "Remove Cloud Layer",
+minetest.register_lbm({
        nodenames = {"default:cloud"},
-       interval = 1,
-       chance = 1,
+       name = "elidragon:remove_cloud_layer",
        action = function(pos)
                if pos.y == -10 then
                        minetest.set_node(pos, { name = "air"})
@@ -179,6 +181,17 @@ minetest.register_abm({
        end
 })
 
+-- remove inventory from quest block
+
+minetest.register_lbm({
+       nodenames = {"elidragon:skyblock", "skyblock:quest"},
+       name = "elidragon:remove_inventory_from_quest_block",
+       action = function(pos)
+               minetest.get_meta(pos):set_string("formspec", "")
+               minetest.get_meta(pos):set_string("infotext", "")
+       end
+})
+
 -- ores
 
 minetest.after(0, function()
@@ -228,7 +241,7 @@ minetest.after(0, function()
                        if stree ~= tree then
                                items[#items + 1] = {
                                        items = {stree .. "sapling"},
-                                       rarity = 250,
+                                       rarity = 1000,
                                }
                        end
                end