atomdmac
/
MineClone5
forked from MineClone5/MineClone5
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge testing

This commit is contained in:
kay27 2022-01-30 07:21:08 +04:00
parent d9181144d5 e4a0645a33
commit d968ceb209
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mods/ITEMS/mcl_fire/init.lua
View File

@ -372,7 +372,7 @@ local function get_ignitable_by_lava(pos)
return check_aircube(vector.add(pos,vector.new(-1,1,-1)),vector.add(pos,vector.new(1,1,1))) or check_aircube(vector.add(pos,vector.new(-2,2,-2)),vector.add(pos,vector.new(2,2,2))) or nil return check_aircube(vector.add(pos,vector.new(-1,1,-1)),vector.add(pos,vector.new(1,1,1))) or check_aircube(vector.add(pos,vector.new(-2,2,-2)),vector.add(pos,vector.new(2,2,2))) or nil
end end
local function add_fire_particle(pos) local function add_fire_particle(pos,f)
minetest.add_particle({ minetest.add_particle({
pos = vector.new({x=pos.x, y=pos.y+0.5, z=pos.z}), pos = vector.new({x=pos.x, y=pos.y+0.5, z=pos.z}),
velocity={x=f.x-pos.x, y=math.max(f.y-pos.y,0.25), z=f.z-pos.z}, velocity={x=f.x-pos.x, y=math.max(f.y-pos.y,0.25), z=f.z-pos.z},
@ -406,7 +406,7 @@ else -- Fire enabled
action = function(pos) action = function(pos)
local p = get_ignitable(pos) local p = get_ignitable(pos)
if p then if p then
add_fire_particle(p) add_fire_particle(p,pos)
spawn_fire(p) spawn_fire(p)
shuffle_adjacents() shuffle_adjacents()
end end
@ -426,7 +426,7 @@ else -- Fire enabled
action = function(pos) action = function(pos)
local p=get_ignitable_by_lava(pos) local p=get_ignitable_by_lava(pos)
if p then if p then
add_fire_particle(p) add_fire_particle(p,pos)
spawn_fire(p) spawn_fire(p)
end end
end, end,
@ -453,7 +453,7 @@ else -- Fire enabled
if def and def._on_burn then if def and def._on_burn then
def._on_burn(p) def._on_burn(p)
elseif fgroup ~= -1 then elseif fgroup ~= -1 then
add_fire_particle(p) add_fire_particle(p,pos)
spawn_fire(p) spawn_fire(p)
fire_timer(p) fire_timer(p)
minetest.check_for_falling(p) minetest.check_for_falling(p)