From 6a79969f7d11f241d4e632de1b3b7a8ae34f5071 Mon Sep 17 00:00:00 2001 From: Nathan Fritzler Date: Sat, 11 Jun 2022 11:47:41 -0600 Subject: [PATCH] Add all uncommited changes --- mods/CORE/mcl_damage/init.lua | 8 ++++++++ mods/CORE/mcl_init/init.lua | 25 ++++++------------------- mods/ITEMS/mcl_core/nodes_base.lua | 3 ++- 3 files changed, 16 insertions(+), 20 deletions(-) diff --git a/mods/CORE/mcl_damage/init.lua b/mods/CORE/mcl_damage/init.lua index 262b0cf55..5e7d4792b 100644 --- a/mods/CORE/mcl_damage/init.lua +++ b/mods/CORE/mcl_damage/init.lua @@ -167,3 +167,11 @@ minetest.register_on_mods_loaded(function() table.sort(mcl_damage.modifiers, function(a, b) return a.priority < b.priority end) end) + +-- TODO move to better place +--[[minetest.register_on_punchplayer(function(player, hitter, time_from_last_punch, tool_capabilities, dir, damage) + return true +end) +--minetest.register_on_player_hpchange(function(player, hp_change, reason) + return 0 +end, true)]] diff --git a/mods/CORE/mcl_init/init.lua b/mods/CORE/mcl_init/init.lua index fec9c7ba9..b219cdc72 100644 --- a/mods/CORE/mcl_init/init.lua +++ b/mods/CORE/mcl_init/init.lua @@ -138,25 +138,12 @@ mcl_vars.mg_nether_min = -29067 -- Carefully chosen to be at a mapchunk border mcl_vars.mg_nether_max = mcl_vars.mg_nether_min + 128 mcl_vars.mg_bedrock_nether_bottom_min = mcl_vars.mg_nether_min mcl_vars.mg_bedrock_nether_top_max = mcl_vars.mg_nether_max -if not superflat then - mcl_vars.mg_bedrock_nether_bottom_max = mcl_vars.mg_bedrock_nether_bottom_min + 4 - mcl_vars.mg_bedrock_nether_top_min = mcl_vars.mg_bedrock_nether_top_max - 4 - mcl_vars.mg_lava_nether_max = mcl_vars.mg_nether_min + 31 -else - -- Thin bedrock in classic superflat mapgen - mcl_vars.mg_bedrock_nether_bottom_max = mcl_vars.mg_bedrock_nether_bottom_min - mcl_vars.mg_bedrock_nether_top_min = mcl_vars.mg_bedrock_nether_top_max - mcl_vars.mg_lava_nether_max = mcl_vars.mg_nether_min + 2 -end -if mg_name == "flat" then - if superflat then - mcl_vars.mg_flat_nether_floor = mcl_vars.mg_bedrock_nether_bottom_max + 4 - mcl_vars.mg_flat_nether_ceiling = mcl_vars.mg_bedrock_nether_bottom_max + 52 - else - mcl_vars.mg_flat_nether_floor = mcl_vars.mg_lava_nether_max + 4 - mcl_vars.mg_flat_nether_ceiling = mcl_vars.mg_lava_nether_max + 52 - end -end +-- Thin bedrock in classic superflat mapgen +mcl_vars.mg_bedrock_nether_bottom_max = mcl_vars.mg_bedrock_nether_bottom_min +mcl_vars.mg_bedrock_nether_top_min = mcl_vars.mg_bedrock_nether_top_max +mcl_vars.mg_lava_nether_max = mcl_vars.mg_nether_min + 2 +mcl_vars.mg_flat_nether_floor = mcl_vars.mg_bedrock_nether_bottom_max + 4 +mcl_vars.mg_flat_nether_ceiling = mcl_vars.mg_bedrock_nether_bottom_max + 52 -- The End (surface at ca. Y = -27000) mcl_vars.mg_end_min = -27073 -- Carefully chosen to be at a mapchunk border diff --git a/mods/ITEMS/mcl_core/nodes_base.lua b/mods/ITEMS/mcl_core/nodes_base.lua index a718b7986..775d5e9a0 100644 --- a/mods/ITEMS/mcl_core/nodes_base.lua +++ b/mods/ITEMS/mcl_core/nodes_base.lua @@ -20,10 +20,11 @@ minetest.register_node("mcl_core:stone", { _mcl_blast_resistance = 6, _mcl_hardness = 1.5, _mcl_silk_touch_drop = true, - on_construct = function (pos) + after_place_node = function (pos, placer) if pos.y == 0 then minetest.set_node(pos, {name="mcl_core:dirt_with_grass"}) end + return placer and placer:is_player() end })