minenux/minetest-game-minetest
minenux/minetest-game-minetest
1
0
Fork 0
Code Issues Pull Requests Activity

merge fix for misc error (fix misc error on boat contidional)

Browse Source 
* recommit 58c2cb6d89bf5bfc3da8818842d081d847d92ecd after upgrade boats
* sync merge with 5.2 stable brach from codeberg repo
This commit is contained in:
Герхард PICCORO Lenz McKAY 2022-07-26 15:30:02 -04:00
commit f3d73386a2
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/boats/init.lua
View File

@ -26,7 +26,7 @@ else
end end
-- check for minetest 5.x compatibility -- check for minetest 5.x compatibility
is_50 = has_feature("httpfetch_binary_data") is_50 = has_feature("httpfetch_binary_data")
is_53 = minetest.has_feature("direct_velocity_on_players") or minetest.has_feature("is_creative_enabled") of false is_53 = minetest.has_feature("direct_velocity_on_players") or minetest.has_feature("is_creative_enabled") or false
-- --
-- Helper functions -- Helper functions

6
mods/default/item_entity.lua
View File

@ -15,8 +15,8 @@ local item = {
burn_up = function(self) burn_up = function(self)
-- disappear in a smoke puff -- disappear in a smoke puff
self.object:remove()
local p = self.object:get_pos() local p = self.object:get_pos()
self.object:remove()
minetest.sound_play("default_item_smoke", { minetest.sound_play("default_item_smoke", {
pos = p, pos = p,
max_hear_distance = 8, max_hear_distance = 8,
@ -48,6 +48,10 @@ local item = {
if self.ignite_timer > 10 then if self.ignite_timer > 10 then
self.ignite_timer = 0 self.ignite_timer = 0
local pos = self.object:get_pos()
if pos == nil then
return -- object already deleted
end
local node = minetest.get_node_or_nil(self.object:get_pos()) local node = minetest.get_node_or_nil(self.object:get_pos())
if not node then if not node then
return return