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

mods/ENTITIES/mcl_burning/init.lua

@@ -23,8 +23,10 @@ minetest.register_entity("mcl_burning:fire", {
 
 minetest.register_globalstep(function(dtime)
 	for _, player in pairs(minetest.get_connected_players()) do
+		if player:get_meta():get_float("mcl_burning:burn_time") > 0 then
 			mcl_burning.tick(player, dtime)
 		end
+	end
 end)
 
 minetest.register_on_respawnplayer(function(player)

mods/ENTITIES/mcl_mobs/api.lua

@@ -3447,7 +3447,7 @@ end
 -- main mob function
 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)
 	end
 

settingtypes.txt

@@ -98,7 +98,7 @@ animated_chests (Animated chests) bool true
 3d_player_preview (3D Player preview) bool true
 
 # 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]
 # Whether ice is translucent. If disabled, ice is fully opaque.