From 8b02a31c12fe933ab8d7bf5a39c8ab28050a3c93 Mon Sep 17 00:00:00 2001 From: LeMagnesium Date: Tue, 16 Feb 2016 14:43:18 +0100 Subject: [PATCH] Update from Creative's repository - For MinetestForFun/server-minetestforfun-creative#57 --- mods/automappercolors/init.lua | 2 +- mods/locked_sign/init.lua | 7 ++- mods/maptools/default_nodes.lua | 2 +- mods/maptools/nodes.lua | 26 ++++------- mods/mobs/api.lua | 4 +- mods/mobs/chicken.lua | 4 +- mods/mobs/dungeonmaster.lua | 5 +- mods/multitest/init.lua | 4 +- mods/multitest/nodes.lua | 34 +++++++------- mods/nether/nether/init.lua | 5 +- mods/nether/nether/portal.lua | 43 ++++++++++-------- mods/pipeworks/wielder.lua | 12 ++++- mods/plantlife_modpack/dryplants/crafting.lua | 8 ++-- mods/plantlife_modpack/dryplants/init.lua | 4 +- .../plantlife_modpack/dryplants/moregrass.lua | 2 +- mods/plantlife_modpack/dryplants/reed.lua | 18 ++++---- mods/plantlife_modpack/ferns/crafting.lua | 2 +- mods/signs_lib/_font/slc_0.png | Bin mods/signs_lib/depends.txt | 1 + mods/signs_lib/extra_fonts/10px/slc_0.png | Bin mods/signs_lib/extra_fonts/10px/slc_1.png | Bin mods/signs_lib/extra_fonts/10px/slc_2.png | Bin mods/signs_lib/extra_fonts/10px/slc_3.png | Bin mods/signs_lib/extra_fonts/10px/slc_4.png | Bin mods/signs_lib/extra_fonts/10px/slc_5.png | Bin mods/signs_lib/extra_fonts/10px/slc_6.png | Bin mods/signs_lib/extra_fonts/10px/slc_7.png | Bin mods/signs_lib/extra_fonts/10px/slc_8.png | Bin mods/signs_lib/extra_fonts/10px/slc_9.png | Bin mods/signs_lib/extra_fonts/10px/slc_A.png | Bin mods/signs_lib/extra_fonts/10px/slc_B.png | Bin mods/signs_lib/extra_fonts/10px/slc_C.png | Bin mods/signs_lib/extra_fonts/10px/slc_D.png | Bin mods/signs_lib/extra_fonts/10px/slc_E.png | Bin mods/signs_lib/extra_fonts/10px/slc_F.png | Bin mods/signs_lib/extra_fonts/10px/slc_n.png | Bin mods/signs_lib/extra_fonts/15px/slc_0.png | Bin mods/signs_lib/extra_fonts/15px/slc_1.png | Bin mods/signs_lib/extra_fonts/15px/slc_2.png | Bin mods/signs_lib/extra_fonts/15px/slc_3.png | Bin mods/signs_lib/extra_fonts/15px/slc_4.png | Bin mods/signs_lib/extra_fonts/15px/slc_5.png | Bin mods/signs_lib/extra_fonts/15px/slc_6.png | Bin mods/signs_lib/extra_fonts/15px/slc_7.png | Bin mods/signs_lib/extra_fonts/15px/slc_8.png | Bin mods/signs_lib/extra_fonts/15px/slc_9.png | Bin mods/signs_lib/extra_fonts/15px/slc_A.png | Bin mods/signs_lib/extra_fonts/15px/slc_B.png | Bin mods/signs_lib/extra_fonts/15px/slc_C.png | Bin mods/signs_lib/extra_fonts/15px/slc_D.png | Bin mods/signs_lib/extra_fonts/15px/slc_E.png | Bin mods/signs_lib/extra_fonts/15px/slc_F.png | Bin mods/signs_lib/extra_fonts/15px/slc_n.png | Bin mods/signs_lib/extra_fonts/24px/slc_0.png | Bin mods/signs_lib/extra_fonts/24px/slc_1.png | Bin mods/signs_lib/extra_fonts/24px/slc_2.png | Bin mods/signs_lib/extra_fonts/24px/slc_3.png | Bin mods/signs_lib/extra_fonts/24px/slc_4.png | Bin mods/signs_lib/extra_fonts/24px/slc_5.png | Bin mods/signs_lib/extra_fonts/24px/slc_6.png | Bin mods/signs_lib/extra_fonts/24px/slc_7.png | Bin mods/signs_lib/extra_fonts/24px/slc_8.png | Bin mods/signs_lib/extra_fonts/24px/slc_9.png | Bin mods/signs_lib/extra_fonts/24px/slc_A.png | Bin mods/signs_lib/extra_fonts/24px/slc_B.png | Bin mods/signs_lib/extra_fonts/24px/slc_C.png | Bin mods/signs_lib/extra_fonts/24px/slc_D.png | Bin mods/signs_lib/extra_fonts/24px/slc_E.png | Bin mods/signs_lib/extra_fonts/24px/slc_F.png | Bin mods/signs_lib/extra_fonts/24px/slc_n.png | Bin mods/signs_lib/extra_fonts/31px/slc_0.png | Bin mods/signs_lib/extra_fonts/31px/slc_1.png | Bin mods/signs_lib/extra_fonts/31px/slc_2.png | Bin mods/signs_lib/extra_fonts/31px/slc_3.png | Bin mods/signs_lib/extra_fonts/31px/slc_4.png | Bin mods/signs_lib/extra_fonts/31px/slc_5.png | Bin mods/signs_lib/extra_fonts/31px/slc_6.png | Bin mods/signs_lib/extra_fonts/31px/slc_7.png | Bin mods/signs_lib/extra_fonts/31px/slc_8.png | Bin mods/signs_lib/extra_fonts/31px/slc_9.png | Bin mods/signs_lib/extra_fonts/31px/slc_A.png | Bin mods/signs_lib/extra_fonts/31px/slc_B.png | Bin mods/signs_lib/extra_fonts/31px/slc_C.png | Bin mods/signs_lib/extra_fonts/31px/slc_D.png | Bin mods/signs_lib/extra_fonts/31px/slc_E.png | Bin mods/signs_lib/extra_fonts/31px/slc_F.png | Bin mods/signs_lib/extra_fonts/31px/slc_n.png | Bin mods/signs_lib/init.lua | 2 +- mods/signs_lib/textures/slc_0.png | Bin mods/signs_lib/textures/slc_1.png | Bin mods/signs_lib/textures/slc_2.png | Bin mods/signs_lib/textures/slc_3.png | Bin mods/signs_lib/textures/slc_4.png | Bin mods/signs_lib/textures/slc_5.png | Bin mods/signs_lib/textures/slc_6.png | Bin mods/signs_lib/textures/slc_7.png | Bin mods/signs_lib/textures/slc_8.png | Bin mods/signs_lib/textures/slc_9.png | Bin mods/signs_lib/textures/slc_A.png | Bin mods/signs_lib/textures/slc_B.png | Bin mods/signs_lib/textures/slc_C.png | Bin mods/signs_lib/textures/slc_D.png | Bin mods/signs_lib/textures/slc_E.png | Bin mods/signs_lib/textures/slc_F.png | Bin mods/signs_lib/textures/slc_n.png | Bin mods/sponge/init.lua | 2 +- mods/warps/init.lua | 4 +- 107 files changed, 102 insertions(+), 89 deletions(-) mode change 100644 => 100755 mods/signs_lib/_font/slc_0.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_0.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_1.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_2.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_3.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_4.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_5.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_6.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_7.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_8.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_9.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_A.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_B.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_C.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_D.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_E.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_F.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/10px/slc_n.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_0.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_1.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_2.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_3.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_4.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_5.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_6.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_7.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_8.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_9.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_A.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_B.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_C.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_D.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_E.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_F.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/15px/slc_n.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_0.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_1.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_2.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_3.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_4.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_5.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_6.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_7.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_8.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_9.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_A.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_B.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_C.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_D.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_E.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_F.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/24px/slc_n.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_0.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_1.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_2.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_3.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_4.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_5.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_6.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_7.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_8.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_9.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_A.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_B.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_C.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_D.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_E.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_F.png mode change 100644 => 100755 mods/signs_lib/extra_fonts/31px/slc_n.png mode change 100644 => 100755 mods/signs_lib/textures/slc_0.png mode change 100644 => 100755 mods/signs_lib/textures/slc_1.png mode change 100644 => 100755 mods/signs_lib/textures/slc_2.png mode change 100644 => 100755 mods/signs_lib/textures/slc_3.png mode change 100644 => 100755 mods/signs_lib/textures/slc_4.png mode change 100644 => 100755 mods/signs_lib/textures/slc_5.png mode change 100644 => 100755 mods/signs_lib/textures/slc_6.png mode change 100644 => 100755 mods/signs_lib/textures/slc_7.png mode change 100644 => 100755 mods/signs_lib/textures/slc_8.png mode change 100644 => 100755 mods/signs_lib/textures/slc_9.png mode change 100644 => 100755 mods/signs_lib/textures/slc_A.png mode change 100644 => 100755 mods/signs_lib/textures/slc_B.png mode change 100644 => 100755 mods/signs_lib/textures/slc_C.png mode change 100644 => 100755 mods/signs_lib/textures/slc_D.png mode change 100644 => 100755 mods/signs_lib/textures/slc_E.png mode change 100644 => 100755 mods/signs_lib/textures/slc_F.png mode change 100644 => 100755 mods/signs_lib/textures/slc_n.png diff --git a/mods/automappercolors/init.lua b/mods/automappercolors/init.lua index 5327a926..55143326 100755 --- a/mods/automappercolors/init.lua +++ b/mods/automappercolors/init.lua @@ -9,7 +9,7 @@ function amc_dumpnodes() local n = 0 for name, def in pairs(minetest.registered_nodes) do if def.drawtype ~= 'airlike' then - local tile = def.tiles + local tile = def.tiles or def.tile_images if type(tile) == 'table' then tile = tile[1] if type(tile) == 'table' then diff --git a/mods/locked_sign/init.lua b/mods/locked_sign/init.lua index 9dcbdfaa..d2d4a06d 100755 --- a/mods/locked_sign/init.lua +++ b/mods/locked_sign/init.lua @@ -28,7 +28,7 @@ minetest.register_node("locked_sign:sign_wall_locked", { on_construct = function(pos) --local n = minetest.get_node(pos) local meta = minetest.get_meta(pos) - meta:set_string("formspec", "hack:sign_text_input") + meta:set_string("formspec", "field[text;;${text}]") meta:set_string("infotext", "\"\"") end, can_dig = function(pos,player) @@ -42,13 +42,12 @@ minetest.register_node("locked_sign:sign_wall_locked", { local meta = minetest.get_meta(pos) local owner = meta:get_string("owner") local pname = sender:get_player_name() - if pname ~= owner and pname ~= minetest.setting_get("name") - and not minetest.check_player_privs(pname, {sign_editor=true}) then + if pname ~= owner and pname ~= minetest.setting_get("name") then return end local meta = minetest.get_meta(pos) fields.text = fields.text or "" - print((sender:get_player_name() or "").." wrote \""..fields.text.. + minetest.log("action", (sender:get_player_name() or "").." wrote \""..fields.text.. "\" to sign at "..minetest.pos_to_string(pos)) meta:set_string("text", fields.text) meta:set_string("infotext", "\"" .. fields.text .. "\" (owned by " .. sender:get_player_name() .. ")") diff --git a/mods/maptools/default_nodes.lua b/mods/maptools/default_nodes.lua index 34e63ec4..0a5d744b 100755 --- a/mods/maptools/default_nodes.lua +++ b/mods/maptools/default_nodes.lua @@ -603,5 +603,5 @@ minetest.register_node("maptools:chest",{ on_metadata_inventory_move = chestdef.on_metadata_inventory_move, on_metadata_inventory_put = chestdef.on_metadata_inventory_put, on_metadata_inventory_take = chestdef.on_metadata_inventory_take, - groups = {unbreakable = 1}, + groups = {unbreakable = 1, not_in_creative_inventory = 1}, }) diff --git a/mods/maptools/nodes.lua b/mods/maptools/nodes.lua index ad5ff1f1..9656d75c 100755 --- a/mods/maptools/nodes.lua +++ b/mods/maptools/nodes.lua @@ -356,24 +356,14 @@ minetest.register_node("maptools:ladder", { sounds = default.node_sound_wood_defaults(), }) -minetest.register_node("maptools:permanent_fire", { - description = S("Permanent Fire"), - range = 12, - stack_max = 10000, - drawtype = "plantlike", - paramtype = "light", - tiles = {{ - name="fire_basic_flame_animated.png", - animation={type="vertical_frames", aspect_w=16, aspect_h=16, length=1}, - }}, - inventory_image = "fire_basic_flame.png", - light_source = 14, - drop = "", - groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative}, - sunlight_propagates = true, - walkable = false, - damage_per_second = 4, -}) +local permafire = table.copy(minetest.registered_nodes["fire:basic_flame"]) +permafire.damage_per_second = 4 +permafire.stack_max = 10000 +permafire.range = 12 +permafire.description = S("Permanent Fire") +permafire.groups = {unbreakable = 1, not_in_creative_inventory = maptools.creative} + +minetest.register_node("maptools:permanent_fire", permafire) minetest.register_node("maptools:fake_fire", { description = S("Fake Fire"), diff --git a/mods/mobs/api.lua b/mods/mobs/api.lua index fbfb6be2..9b5bba44 100755 --- a/mods/mobs/api.lua +++ b/mods/mobs/api.lua @@ -2472,7 +2472,9 @@ function mobs:register_egg(mob, desc, background, addegg) inventory_image = invimg, on_place = function(itemstack, placer, pointed_thing) - + if not minetest.check_player_privs(placer:get_player_name(), {server=true}) then -- MFF + return + end local pos = pointed_thing.above if pos diff --git a/mods/mobs/chicken.lua b/mods/mobs/chicken.lua index 552a6eea..11337735 100755 --- a/mods/mobs/chicken.lua +++ b/mods/mobs/chicken.lua @@ -7,8 +7,8 @@ mobs:register_mob("mobs:chicken", { -- is it aggressive passive = true, -- health & armor - hp_min = 5, - hp_max = 10, + hp_min = 4, + hp_max = 8, armor = 200, -- textures and model collisionbox = {-0.3, -0.75, -0.3, 0.3, 0.1, 0.3}, diff --git a/mods/mobs/dungeonmaster.lua b/mods/mobs/dungeonmaster.lua index 445feea7..8ce8a3c6 100755 --- a/mods/mobs/dungeonmaster.lua +++ b/mods/mobs/dungeonmaster.lua @@ -1,6 +1,9 @@ -- Dungeon Master by PilzAdam +-- Node which cannot be destroyed by DungeonMasters' fireballs +local excluded = {"nether:netherrack","default:obsidian_glass","default:obsidian", "default:obsidian_cooled", "default:bedrock", "doors:door_steel_b_1", "doors:door_steel_t_1", "doors:door_steel_b_2", "doors:door_steel_t_2","default:chest_locked"} + mobs:register_mob("mobs:dungeon_master", { -- animal, monster, npc, barbarian type = "monster", @@ -92,7 +95,7 @@ mobs:register_arrow("mobs:fireball", { }, nil) end, - -- node hit, bursts into flame + -- node hit, bursts into flame (cannot blast through obsidian or protection redo mod items) hit_node = function(self, pos, node) mobs:explosion(pos, 1, 1, 0) end diff --git a/mods/multitest/init.lua b/mods/multitest/init.lua index e4e71be3..00f13ba9 100755 --- a/mods/multitest/init.lua +++ b/mods/multitest/init.lua @@ -1,7 +1,7 @@ multitest = {} -multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", -"dark_grey", "green", "grey", "magenta", "orange", +multitest.colors = {"black", "blue", "brown", "cyan", "dark_green", +"dark_grey", "green", "grey", "magenta", "orange", "pink", "red", "violet", "white", "yellow"} multitest.colornames = {"Black", "Blue", "Brown", "Cyan", "Dark Green", diff --git a/mods/multitest/nodes.lua b/mods/multitest/nodes.lua index ffdfe164..30448217 100755 --- a/mods/multitest/nodes.lua +++ b/mods/multitest/nodes.lua @@ -24,7 +24,7 @@ minetest.register_node("multitest:blackstone_paved", { description = "Paved Blackstone", tiles = {"multitest_blackstone_paved.png"}, groups = {cracky=2, stone=1}, - sounds = default.node_sound_stone_defaults(), + sounds = default.node_sound_stone_defaults(), }) minetest.register_node("multitest:blackstone_paved", { @@ -122,28 +122,28 @@ minetest.register_node("multitest:sandstone_carved", { }) -- stairs:stair_blackstone -stairs.register_stair_and_slab("blackstone", "multitest:blackstone", - {cracky=3, stone=1}, - {"multitest_blackstone.png"}, - "Blackstone Stairs", +stairs.register_stair_and_slab("blackstone", "multitest:blackstone", + {cracky=3, stone=1}, + {"multitest_blackstone.png"}, + "Blackstone Stairs", "Blackstone Slab", nil) -stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", - {cracky=3, stone=1}, - {"multitest_blackcobble.png"}, - "Black Cobble Stairs", +stairs.register_stair_and_slab("blackcobble", "multitest:blackcobble", + {cracky=3, stone=1}, + {"multitest_blackcobble.png"}, + "Black Cobble Stairs", "Black Cobble Slab", nil) -stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", - {cracky=3, stone=1}, - {"multitest_blackstone_brick.png"}, - "Blackstonestone brick Stairs", +stairs.register_stair_and_slab("blackstone_bricks", "multitest:blackstone_brick", + {cracky=3, stone=1}, + {"multitest_blackstone_brick.png"}, + "Blackstonestone brick Stairs", "Blackstone Brick Slab", nil) -stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", - {cracky=3, stone=1}, - {"multitest_blackstone_paved.png"}, - "Paved Blackstone Stairs", +stairs.register_stair_and_slab("blackstone_paved", "multitest:blackstone_paved", + {cracky=3, stone=1}, + {"multitest_blackstone_paved.png"}, + "Paved Blackstone Stairs", "Paved Blackstone Slab", nil) -- others diff --git a/mods/nether/nether/init.lua b/mods/nether/nether/init.lua index 96e50125..4aa43f50 100755 --- a/mods/nether/nether/init.lua +++ b/mods/nether/nether/init.lua @@ -142,15 +142,16 @@ local function do_ws_func(depth, a, x) return SIZE*y/math.pi end +local chunksize = minetest.setting_get("chunksize") or 5 local ws_lists = {} -local function get_ws_list(a,x, sidelength) +local function get_ws_list(a,x) ws_lists[a] = ws_lists[a] or {} local v = ws_lists[a][x] if v then return v end v = {} - for x=x,x + (sidelength - 1) do + for x=x,x + (chunksize*16 - 1) do local y = do_ws_func(ssize, a, x) v[x] = y end diff --git a/mods/nether/nether/portal.lua b/mods/nether/nether/portal.lua index 5bcbf5a8..2f4dc964 100755 --- a/mods/nether/nether/portal.lua +++ b/mods/nether/nether/portal.lua @@ -178,7 +178,12 @@ minetest.register_chatcommand("from_hell", { minetest.chat_send_player(pname, "You are free now") player_from_nether(player) local pos = player:getpos() - player:moveto({x=pos.x, y=100, z=pos.z}) + local pos_togo = {x=pos.x, y=100, z=pos.z} + if minetest.setting_getbool("static_spawnpoint") ~= nil then + local stsp_conf = minetest.setting_get("static_spawnpoint") + pos_togo = {x = stsp_conf:split(",")[1]+0,y = stsp_conf:split(",")[2]+0,z = stsp_conf:split(",")[3]+0} + end + player:moveto(pos_togo) return true, pname.." is now out of the nether." end })]] @@ -227,15 +232,11 @@ if nether_prisons then end -- fix wrong player positions - local timer = 0 --doesn't work if the server lags - minetest.register_globalstep(function(dtime) - timer = timer + dtime; - if timer >= 2 then - --minetest.after(1, update_players) - update_players() - timer = 0 - end - end) + local function tick() + update_players() + minetest.after(2, tick) + end + tick() -- set background when player joins minetest.register_on_joinplayer(function(player) @@ -654,17 +655,21 @@ function nether_port(player, pos) set_portal(known_portals_d, pos.z,pos.x, pos.y) nether.player_from_nether(player) - 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 + if minetest.setting_getbool("static_spawnpoint") then + local stsp_conf = minetest.setting_get("static_spawnpoint") + pos = minetest.string_to_pos(stsp_conf) else - y = my 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 end - pos.y = y - player:moveto(pos) else set_portal(known_portals_u, pos.z,pos.x, pos.y) diff --git a/mods/pipeworks/wielder.lua b/mods/pipeworks/wielder.lua index d873d09b..cc8147da 100755 --- a/mods/pipeworks/wielder.lua +++ b/mods/pipeworks/wielder.lua @@ -408,7 +408,17 @@ if pipeworks.enable_deployer then sneak = false, act = function(virtplayer, pointed_thing) local wieldstack = virtplayer:get_wielded_item() - virtplayer:set_wielded_item((minetest.registered_items[wieldstack:get_name()] or {on_place=minetest.item_place}).on_place(wieldstack, virtplayer, pointed_thing) or wieldstack) + if not minetest.setting_getbool("creative_mode") then + virtplayer:set_wielded_item((minetest.registered_items[wieldstack:get_name()] or {on_place=minetest.item_place}).on_place(wieldstack, virtplayer, pointed_thing) or wieldstack) + else + local stack = (minetest.registered_items[wieldstack:get_name()] or {on_place=minetest.item_place}).on_place(wieldstack, virtplayer, pointed_thing) + if stack:get_name() ~= wieldstack:get_name() or stack:get_count() ~= wieldstack:get_count() then + virtplayer:set_wielded_item(stack) + else -- Manual decrease + wieldstack:take_item(1) + virtplayer:set_wielded_item(wieldstack) + end + end end, eject_drops = false, }) diff --git a/mods/plantlife_modpack/dryplants/crafting.lua b/mods/plantlife_modpack/dryplants/crafting.lua index 69154b50..af061536 100755 --- a/mods/plantlife_modpack/dryplants/crafting.lua +++ b/mods/plantlife_modpack/dryplants/crafting.lua @@ -2,10 +2,10 @@ -- Dry Plants - Recipes 0.1.0 -- Short Grass -> Dirt ----------------------------------------------------------------------------------------------- -- by Mossmanikin --- License (everything): WTFPL +-- License (everything): WTFPL -- Looked at code from: darkage, default, farming, sickle, stairs -- Dependencies: default, farming --- Supports: flint, stoneage, sumpf +-- Supports: flint, stoneage, sumpf ----------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------- @@ -220,7 +220,7 @@ for i in pairs(ReeD) do recipe = { {slab}, } - }) + }) ----------------------------------------------------------------------------------------------- -- Roof Corner ----------------------------------------------------------------------------------------------- @@ -343,7 +343,7 @@ minetest.register_craft({ burntime = 2, }) ----------------------------------------------------------------------------------------------- --- Dandelion Leave +-- Dandelion Leave ----------------------------------------------------------------------------------------------- --[[minetest.register_craftitem("dryplants:dandelion_leave", { description = "Dandelion Leave", diff --git a/mods/plantlife_modpack/dryplants/init.lua b/mods/plantlife_modpack/dryplants/init.lua index 6433b42d..e78fa10e 100755 --- a/mods/plantlife_modpack/dryplants/init.lua +++ b/mods/plantlife_modpack/dryplants/init.lua @@ -7,10 +7,10 @@ local mname = "dryplants" -- textures & ideas partly by Neuromancer -- License (everything): WTFPL --- Contains code from: default, farming +-- Contains code from: default, farming -- Looked at code from: darkage, sickle, stairs -- Dependencies: default, farming, biome_lib --- Supports: +-- Supports: ----------------------------------------------------------------------------------------------- abstract_dryplants = {} diff --git a/mods/plantlife_modpack/dryplants/moregrass.lua b/mods/plantlife_modpack/dryplants/moregrass.lua index 88761c88..46add747 100755 --- a/mods/plantlife_modpack/dryplants/moregrass.lua +++ b/mods/plantlife_modpack/dryplants/moregrass.lua @@ -5,7 +5,7 @@ -- License (everything): WTFPL -- Contains code from: biome_lib --- Looked at code from: default +-- Looked at code from: default ----------------------------------------------------------------------------------------------- abstract_dryplants.grow_grass = function(pos) diff --git a/mods/plantlife_modpack/dryplants/reed.lua b/mods/plantlife_modpack/dryplants/reed.lua index 6f290285..22f04293 100755 --- a/mods/plantlife_modpack/dryplants/reed.lua +++ b/mods/plantlife_modpack/dryplants/reed.lua @@ -4,7 +4,7 @@ -- by Mossmanikin -- License (everything): WTFPL -- Looked at code from: darkage, default, stairs --- Dependencies: default +-- Dependencies: default ----------------------------------------------------------------------------------------------- minetest.register_alias("stairs:stair_wetreed", "dryplants:wetreed_roof") minetest.register_alias("stairs:slab_wetreed", "dryplants:wetreed_slab") @@ -93,7 +93,7 @@ if AUTO_ROOF_CORNER == true then interval = 1, chance = 1, action = function(pos) - + local node_east = minetest.get_node({x=pos.x+1, y=pos.y, z=pos.z }) local node_west = minetest.get_node({x=pos.x-1, y=pos.y, z=pos.z }) local node_north = minetest.get_node({x=pos.x, y=pos.y, z=pos.z+1}) @@ -106,7 +106,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 1) or (node_north.name == corner and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 0) @@ -114,7 +114,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 2) or (node_east.name == corner and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 1) @@ -122,7 +122,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 3) or (node_south.name == corner and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 2) @@ -138,7 +138,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=0}) end - + if ((node_north.name == roof and node_north.param2 == 3) or (node_north.name == corner_2 and node_north.param2 == 2)) and ((node_east.name == roof and node_east.param2 == 2) @@ -146,7 +146,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=1}) end - + if ((node_east.name == roof and node_east.param2 == 0) or (node_east.name == corner_2 and node_east.param2 == 3)) and ((node_south.name == roof and node_south.param2 == 3) @@ -154,7 +154,7 @@ if AUTO_ROOF_CORNER == true then then minetest.set_node(pos, {name=corner_2, param2=2}) end - + if ((node_south.name == roof and node_south.param2 == 1) or (node_south.name == corner_2 and node_south.param2 == 0)) and ((node_west.name == roof and node_west.param2 == 0) @@ -227,7 +227,7 @@ minetest.register_node("dryplants:wetreed_roof_corner_2", { groups = {snappy=3, flammable=2}, sounds = default.node_sound_leaves_defaults(), }) - + ----------------------------------------------------------------------------------------------- -- Wet Reed becomes (dry) Reed over time ----------------------------------------------------------------------------------------------- diff --git a/mods/plantlife_modpack/ferns/crafting.lua b/mods/plantlife_modpack/ferns/crafting.lua index 8d8b3edf..10531ad8 100755 --- a/mods/plantlife_modpack/ferns/crafting.lua +++ b/mods/plantlife_modpack/ferns/crafting.lua @@ -2,7 +2,7 @@ -- Ferns - Crafting 0.0.5 ----------------------------------------------------------------------------------------------- -- (by Mossmanikin) --- License (everything): WTFPL +-- License (everything): WTFPL ----------------------------------------------------------------------------------------------- minetest.register_craft({ type = "shapeless", diff --git a/mods/signs_lib/_font/slc_0.png b/mods/signs_lib/_font/slc_0.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/depends.txt b/mods/signs_lib/depends.txt index abb8bd5c..ea3e3a01 100644 --- a/mods/signs_lib/depends.txt +++ b/mods/signs_lib/depends.txt @@ -2,3 +2,4 @@ default intllib? screwdriver? keyword_interact? +locked_sign? diff --git a/mods/signs_lib/extra_fonts/10px/slc_0.png b/mods/signs_lib/extra_fonts/10px/slc_0.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_1.png b/mods/signs_lib/extra_fonts/10px/slc_1.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_2.png b/mods/signs_lib/extra_fonts/10px/slc_2.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_3.png b/mods/signs_lib/extra_fonts/10px/slc_3.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_4.png b/mods/signs_lib/extra_fonts/10px/slc_4.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_5.png b/mods/signs_lib/extra_fonts/10px/slc_5.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_6.png b/mods/signs_lib/extra_fonts/10px/slc_6.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_7.png b/mods/signs_lib/extra_fonts/10px/slc_7.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_8.png b/mods/signs_lib/extra_fonts/10px/slc_8.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_9.png b/mods/signs_lib/extra_fonts/10px/slc_9.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_A.png b/mods/signs_lib/extra_fonts/10px/slc_A.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_B.png b/mods/signs_lib/extra_fonts/10px/slc_B.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_C.png b/mods/signs_lib/extra_fonts/10px/slc_C.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_D.png b/mods/signs_lib/extra_fonts/10px/slc_D.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_E.png b/mods/signs_lib/extra_fonts/10px/slc_E.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_F.png b/mods/signs_lib/extra_fonts/10px/slc_F.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/10px/slc_n.png b/mods/signs_lib/extra_fonts/10px/slc_n.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_0.png b/mods/signs_lib/extra_fonts/15px/slc_0.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_1.png b/mods/signs_lib/extra_fonts/15px/slc_1.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_2.png b/mods/signs_lib/extra_fonts/15px/slc_2.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_3.png b/mods/signs_lib/extra_fonts/15px/slc_3.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_4.png b/mods/signs_lib/extra_fonts/15px/slc_4.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_5.png b/mods/signs_lib/extra_fonts/15px/slc_5.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_6.png b/mods/signs_lib/extra_fonts/15px/slc_6.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_7.png b/mods/signs_lib/extra_fonts/15px/slc_7.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_8.png b/mods/signs_lib/extra_fonts/15px/slc_8.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_9.png b/mods/signs_lib/extra_fonts/15px/slc_9.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_A.png b/mods/signs_lib/extra_fonts/15px/slc_A.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_B.png b/mods/signs_lib/extra_fonts/15px/slc_B.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_C.png b/mods/signs_lib/extra_fonts/15px/slc_C.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_D.png b/mods/signs_lib/extra_fonts/15px/slc_D.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_E.png b/mods/signs_lib/extra_fonts/15px/slc_E.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_F.png b/mods/signs_lib/extra_fonts/15px/slc_F.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/15px/slc_n.png b/mods/signs_lib/extra_fonts/15px/slc_n.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_0.png b/mods/signs_lib/extra_fonts/24px/slc_0.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_1.png b/mods/signs_lib/extra_fonts/24px/slc_1.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_2.png b/mods/signs_lib/extra_fonts/24px/slc_2.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_3.png b/mods/signs_lib/extra_fonts/24px/slc_3.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_4.png b/mods/signs_lib/extra_fonts/24px/slc_4.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_5.png b/mods/signs_lib/extra_fonts/24px/slc_5.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_6.png b/mods/signs_lib/extra_fonts/24px/slc_6.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_7.png b/mods/signs_lib/extra_fonts/24px/slc_7.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_8.png b/mods/signs_lib/extra_fonts/24px/slc_8.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_9.png b/mods/signs_lib/extra_fonts/24px/slc_9.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_A.png b/mods/signs_lib/extra_fonts/24px/slc_A.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_B.png b/mods/signs_lib/extra_fonts/24px/slc_B.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_C.png b/mods/signs_lib/extra_fonts/24px/slc_C.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_D.png b/mods/signs_lib/extra_fonts/24px/slc_D.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_E.png b/mods/signs_lib/extra_fonts/24px/slc_E.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_F.png b/mods/signs_lib/extra_fonts/24px/slc_F.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/24px/slc_n.png b/mods/signs_lib/extra_fonts/24px/slc_n.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_0.png b/mods/signs_lib/extra_fonts/31px/slc_0.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_1.png b/mods/signs_lib/extra_fonts/31px/slc_1.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_2.png b/mods/signs_lib/extra_fonts/31px/slc_2.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_3.png b/mods/signs_lib/extra_fonts/31px/slc_3.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_4.png b/mods/signs_lib/extra_fonts/31px/slc_4.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_5.png b/mods/signs_lib/extra_fonts/31px/slc_5.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_6.png b/mods/signs_lib/extra_fonts/31px/slc_6.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_7.png b/mods/signs_lib/extra_fonts/31px/slc_7.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_8.png b/mods/signs_lib/extra_fonts/31px/slc_8.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_9.png b/mods/signs_lib/extra_fonts/31px/slc_9.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_A.png b/mods/signs_lib/extra_fonts/31px/slc_A.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_B.png b/mods/signs_lib/extra_fonts/31px/slc_B.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_C.png b/mods/signs_lib/extra_fonts/31px/slc_C.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_D.png b/mods/signs_lib/extra_fonts/31px/slc_D.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_E.png b/mods/signs_lib/extra_fonts/31px/slc_E.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_F.png b/mods/signs_lib/extra_fonts/31px/slc_F.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/extra_fonts/31px/slc_n.png b/mods/signs_lib/extra_fonts/31px/slc_n.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/init.lua b/mods/signs_lib/init.lua index f6760f65..22d259ca 100644 --- a/mods/signs_lib/init.lua +++ b/mods/signs_lib/init.lua @@ -479,7 +479,7 @@ signs_lib.update_sign = function(pos, fields, owner) meta:set_string("infotext", ownstr..string.gsub(make_infotext(fields.text), "@KEYWORD", current_keyword).." ") meta:set_string("text", fields.text) - + meta:set_int("__signslib_new_format", 1) new = true else diff --git a/mods/signs_lib/textures/slc_0.png b/mods/signs_lib/textures/slc_0.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_1.png b/mods/signs_lib/textures/slc_1.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_2.png b/mods/signs_lib/textures/slc_2.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_3.png b/mods/signs_lib/textures/slc_3.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_4.png b/mods/signs_lib/textures/slc_4.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_5.png b/mods/signs_lib/textures/slc_5.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_6.png b/mods/signs_lib/textures/slc_6.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_7.png b/mods/signs_lib/textures/slc_7.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_8.png b/mods/signs_lib/textures/slc_8.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_9.png b/mods/signs_lib/textures/slc_9.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_A.png b/mods/signs_lib/textures/slc_A.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_B.png b/mods/signs_lib/textures/slc_B.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_C.png b/mods/signs_lib/textures/slc_C.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_D.png b/mods/signs_lib/textures/slc_D.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_E.png b/mods/signs_lib/textures/slc_E.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_F.png b/mods/signs_lib/textures/slc_F.png old mode 100644 new mode 100755 diff --git a/mods/signs_lib/textures/slc_n.png b/mods/signs_lib/textures/slc_n.png old mode 100644 new mode 100755 diff --git a/mods/sponge/init.lua b/mods/sponge/init.lua index 1096bd3b..d0cd257d 100755 --- a/mods/sponge/init.lua +++ b/mods/sponge/init.lua @@ -28,7 +28,7 @@ minetest.register_node("sponge:sponge", { p = {x=pos.x+i, y=pos.y, z=pos.z} n = minetest.get_node(p) -- On verifie si il y a de l'eau - if (n.name=="default:water_flowing") or (n.name == "default:water_source") + if (n.name=="default:water_flowing") or (n.name == "default:water_source") or (n.name == "default:river_water_flowing") or (n.name == "default:river_water_source") then on_water = true end diff --git a/mods/warps/init.lua b/mods/warps/init.lua index 2b17e7ec..4e594a99 100755 --- a/mods/warps/init.lua +++ b/mods/warps/init.lua @@ -139,7 +139,6 @@ minetest.register_chatcommand("setwarp", { description = "Set a warp location to the players location", privs = { warp_admin = true }, func = function(name, param) - param = param:gsub("%W", "") local h = "created" for i = 1,table.getn(warps) do if warps[i].name == param then @@ -150,6 +149,9 @@ minetest.register_chatcommand("setwarp", { end local player = minetest.get_player_by_name(name) local pos = player:getpos() + if not pos then + return false, "Internal error while getting your position. Please try again later" + end table.insert(warps, { name = param, x = pos.x, y = pos.y, z = pos.z, yaw = player:get_look_yaw(), pitch = player:get_look_pitch() }) save() minetest.log("action", name .. " " .. h .. " warp \"" .. param .. "\": " .. pos.x .. ", " .. pos.y .. ", " .. pos.z)