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

Merge pull request 'Fix crash when creeper explodes in minecart' (#3698) from creeper_in_mc_explosion_crash into master

Browse source 
Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/3698
Reviewed-by: PrairieWind <prairiewind@noreply.git.minetest.land>
This commit is contained in:
PrairieWind 2023-05-08 16:04:31 +00:00
commit 848003de85
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
mods/ENTITIES/mcl_burning/api.lua
View file

@ -5,7 +5,12 @@ function mcl_burning.get_storage(obj)
end end
function mcl_burning.is_burning(obj) function mcl_burning.is_burning(obj)
local storage = mcl_burning.get_storage(obj)
if storage then
return mcl_burning.get_storage(obj).burn_time return mcl_burning.get_storage(obj).burn_time
else
return false
end
end end
function mcl_burning.is_affected_by_rain(obj) function mcl_burning.is_affected_by_rain(obj)

7
mods/ENTITIES/mcl_minecarts/init.lua
View file

@ -370,15 +370,12 @@ local function register_entity(entity_id, mesh, textures, drop, on_rightclick, o
end end
end end
end end
-- Make room in the minecart after the mob dies
elseif self._passenger then elseif self._passenger then
if math.random(1,20) == 1 then local passenger_pos = self._passenger.object:get_pos()
local dead = self._passenger:check_for_death() if not passenger_pos then
if dead == true then
self._passenger = nil self._passenger = nil
end end
end end
end
-- Drop minecart if it isn't on a rail anymore -- Drop minecart if it isn't on a rail anymore
if self._last_float_check >= mcl_minecarts.check_float_time then if self._last_float_check >= mcl_minecarts.check_float_time then