Merge remote-tracking branch 'refs/remotes/HeroOfTheWinds/master'

FaceDeer · Sep 13, 2017 · 5d13e78 · 5d13e78
2 parents 7502783 + 9ab6487
commit 5d13e78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/falling_ice.lua b/falling_ice.lua
@@ -186,7 +186,7 @@ function caverealms:nodeupdate_single(p, delay)
  end
 
  if minetest.get_item_group(n.name, "attached_node") ~= 0 then
- if not check_attached_node(p, n) then
+ if not caverealms:check_attached_node(p, n) then
  caverealms:drop_attached_node(p)
  caverealms:nodeupdate(p)
  end

diff --git a/nodes.lua b/nodes.lua
@@ -521,6 +521,9 @@ minetest.register_node("caverealms:mushroom_gills", {
  paramtype = "light",
 })
 
+--define special flame so that it does not expire
+minetest.register_alias("caverealms:constant_flame", "fire:permanent_flame")
+
 --node to create a treasure chest in DM Forts.
 minetest.register_node("caverealms:s_chest", {
  description = "Trying to rob the bank before it's opened, eh?",