Minetest/VoxeLibre
2
0
Fork 0
mirror of https://git.minetest.land/VoxeLibre/VoxeLibre.git synced 2024-11-22 18:41:09 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://git.minetest.land:29418/MineClone2/MineClone2

Browse source
This commit is contained in:
AFCMS 2021-04-17 09:26:49 +02:00
commit 6a55136517
3 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
mods/ENTITIES/mcl_burning/init.lua
View file

@ -15,7 +15,7 @@ minetest.register_entity("mcl_burning:fire", {
pointable = false, pointable = false,
glow = -1, glow = -1,
}, },
animation_frame = 0, animation_frame = 0,
animation_timer = 0, animation_timer = 0,
on_step = mcl_burning.fire_entity_step, on_step = mcl_burning.fire_entity_step,
@ -23,7 +23,9 @@ minetest.register_entity("mcl_burning:fire", {
minetest.register_globalstep(function(dtime) minetest.register_globalstep(function(dtime)
for _, player in pairs(minetest.get_connected_players()) do for _, player in pairs(minetest.get_connected_players()) do
mcl_burning.tick(player, dtime) if player:get_meta():get_float("mcl_burning:burn_time") > 0 then
mcl_burning.tick(player, dtime)
end
end end
end) end)

4
mods/ENTITIES/mcl_mobs/api.lua
View file

@ -3447,7 +3447,7 @@ end
-- main mob function -- main mob function
local mob_step = function(self, dtime) local mob_step = function(self, dtime)
if not self.fire_resistant then if not self.fire_resistant and self.mcl_burning_burn_time and self.mcl_burning_burn_time > 0 then
mcl_burning.tick(self.object, dtime) mcl_burning.tick(self.object, dtime)
end end
@ -3906,7 +3906,7 @@ minetest.register_entity(name, {
--default built in engine collision detection --default built in engine collision detection
self.object:set_properties({ self.object:set_properties({
collide_with_objects = false, collide_with_objects = false,
}) })
return mob_activate(self, staticdata, def, dtime) return mob_activate(self, staticdata, def, dtime)
end, end,

2
settingtypes.txt
View file

@ -98,7 +98,7 @@ animated_chests (Animated chests) bool true
3d_player_preview (3D Player preview) bool true 3d_player_preview (3D Player preview) bool true
# The maximum number of boss bars to simultaniously display on the screen # The maximum number of boss bars to simultaniously display on the screen
max_bossbars (Maximum Boss bars) int 4 max_bossbars (Maximum Boss bars) int 5
[Experimental] [Experimental]
# Whether ice is translucent. If disabled, ice is fully opaque. # Whether ice is translucent. If disabled, ice is fully opaque.