Merge branch 'master' into mineclone5

This commit is contained in:
Lizzy Fleckenstein 2021-04-29 12:29:01 +02:00
commit e545e6d0e7
1 changed files with 4 additions and 0 deletions

View File

@ -1646,6 +1646,8 @@ local do_env_damage = function(self)
self.health = self.health - self.lava_damage
mcl_burning.set_on_fire(self.object, 15)
effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
if check_for_death(self, "lava", {type = "environment",
@ -1662,6 +1664,8 @@ local do_env_damage = function(self)
self.health = self.health - self.fire_damage
mcl_burning.set_on_fire(self.object, 8)
effect(pos, 5, "fire_basic_flame.png", nil, nil, 1, nil)
if check_for_death(self, "fire", {type = "environment",