Fix TNT mod crash when entities disappear during explosion (#2616)

rebased #2368

README.txt

@@ -9,8 +9,8 @@ ShadowNinja (MIT)
 sofar (sofar@foo-projects.org) (MIT)
 Various Minetest developers and contributors (MIT)
 
-Authors of media (textures)
----------------------------
+Authors of media
+----------------
 BlockMen (CC BY-SA 3.0):
 All textures not mentioned below.
 
@@ -23,22 +23,52 @@ All gunpowder textures except tnt_gunpowder_inventory.png.
 sofar (sofar@foo-projects.org) (CC BY-SA 3.0):
 tnt_blast.png
 
+paramat (CC BY-SA 3.0)
+tnt_tnt_stick.png - Derived from a texture by benrob0329.
+
+TumeniNodes (CC0 1.0)
+tnt_explode.ogg
+renamed, edited, and converted to .ogg from Explosion2.wav
+by steveygos93 (CC0 1.0)
+<https://freesound.org/s/80401/>
+
+tnt_ignite.ogg
+renamed, edited, and converted to .ogg from sparkler_fuse_nm.wav
+by theneedle.tv (CC0 1.0)
+<https://freesound.org/s/316682/>
+
+tnt_gunpowder_burning.ogg
+renamed, edited, and converted to .ogg from road flare ignite burns.wav
+by frankelmedico (CC0 1.0)
+<https://freesound.org/s/348767/>
+
+
 Introduction
 ------------
 This mod adds TNT to Minetest. TNT is a tool to help the player
 in mining.
 
 How to use the mod:
-Craft gunpowder by placing coal and gravel in the crafting area.
-The gunpowder can be used to craft TNT or as fuse for TNT.
-To craft TNT place items like this:
--- wood - gunpowder -- wood -
-gunpowder gunpowder gunpowder
--- wood - gunpowder -- wood -
 
-There are different ways to blow up TNT:
+Craft gunpowder by placing coal and gravel in the crafting area.
+The gunpowder can be used to craft TNT sticks or as a fuse trail for TNT.
+
+To craft 2 TNT sticks:
+G_G
+GPG
+G_G
+G = gunpowder
+P = paper
+The sticks are not usable as an explosive.
+
+Craft TNT from 9 TNT sticks.
+
+There are different ways to ignite TNT:
   1. Hit it with a torch.
-  2. Hit a gunpowder fuse that leads to a TNT block with a torch or flint-and-steel.
+  2. Hit a gunpowder fuse trail that leads to TNT with a torch or
+     flint-and-steel.
   3. Activate it with mesecons (fastest way).
 
-Be aware of the damage radius of 6 blocks!
+For 1 TNT:
+Node destruction radius is 3 nodes.
+Player and object damage radius is 6 nodes.

depends.txt

@@ -1,3 +0,0 @@
-default
-fire
-

init.lua

@@ -1,5 +1,11 @@
+-- tnt/init.lua
+
 tnt = {}
 
+-- Load support for MT game translation.
+local S = minetest.get_translator("tnt")
+
+
 -- Default to enabled when in singleplayer
 local enable_tnt = minetest.settings:get_bool("enable_tnt")
 if enable_tnt == nil then
@@ -58,8 +64,8 @@ local function eject_drops(drops, pos, radius)
 			local obj = minetest.add_item(drop_pos, dropitem)
 			if obj then
 				obj:get_luaentity().collect = true
-				obj:setacceleration({x = 0, y = -10, z = 0})
-				obj:setvelocity({x = math.random(-3, 3),
+				obj:set_acceleration({x = 0, y = -10, z = 0})
+				obj:set_velocity({x = math.random(-3, 3),
 						y = math.random(0, 10),
 						z = math.random(-3, 3)})
 			end
@@ -86,8 +92,8 @@ end
 local basic_flame_on_construct -- cached value
 local function destroy(drops, npos, cid, c_air, c_fire,
 		on_blast_queue, on_construct_queue,
-		ignore_protection, ignore_on_blast)
-	if not ignore_protection and minetest.is_protected(npos, "") then
+		ignore_protection, ignore_on_blast, owner)
+	if not ignore_protection and minetest.is_protected(npos, owner) then
 		return cid
 	end
 
@@ -152,26 +158,28 @@ end
 local function entity_physics(pos, radius, drops)
 	local objs = minetest.get_objects_inside_radius(pos, radius)
 	for _, obj in pairs(objs) do
-		local obj_pos = obj:getpos()
+		local obj_pos = obj:get_pos()
 		local dist = math.max(1, vector.distance(pos, obj_pos))
 
 		local damage = (4 / dist) * radius
 		if obj:is_player() then
-			-- currently the engine has no method to set
-			-- player velocity. See #2960
-			-- instead, we knock the player back 1.0 node, and slightly upwards
+			-- we knock the player back 1.0 node, and slightly upwards
+			-- TODO: switch to add_player_velocity() introduced in 5.1
 			local dir = vector.normalize(vector.subtract(obj_pos, pos))
 			local moveoff = vector.multiply(dir, dist + 1.0)
 			local newpos = vector.add(pos, moveoff)
 			newpos = vector.add(newpos, {x = 0, y = 0.2, z = 0})
-			obj:setpos(newpos)
+			obj:set_pos(newpos)
 
 			obj:set_hp(obj:get_hp() - damage)
 		else
+			local luaobj = obj:get_luaentity()
+
+			-- object might have disappeared somehow
+			if luaobj then
 				local do_damage = true
 				local do_knockback = true
 				local entity_drops = {}
-			local luaobj = obj:get_luaentity()
 				local objdef = minetest.registered_entities[luaobj.name]
 
 				if objdef and objdef.on_blast then
@@ -179,8 +187,8 @@ local function entity_physics(pos, radius, drops)
 				end
 
 				if do_knockback then
-				local obj_vel = obj:getvelocity()
-				obj:setvelocity(calc_velocity(pos, obj_pos,
+					local obj_vel = obj:get_velocity()
+					obj:set_velocity(calc_velocity(pos, obj_pos,
 							obj_vel, radius * 10))
 				end
 				if do_damage then
@@ -196,6 +204,7 @@ local function entity_physics(pos, radius, drops)
 				end
 			end
 		end
+	end
 end
 
 local function add_effects(pos, radius, drops)
@@ -208,6 +217,7 @@ local function add_effects(pos, radius, drops)
 		collisiondetection = false,
 		vertical = false,
 		texture = "tnt_boom.png",
+		glow = 15,
 	})
 	minetest.add_particlespawner({
 		amount = 64,
@@ -266,13 +276,13 @@ function tnt.burn(pos, nodename)
 	elseif def.on_ignite then
 		def.on_ignite(pos)
 	elseif minetest.get_item_group(name, "tnt") > 0 then
-		minetest.sound_play("tnt_ignite", {pos = pos})
-		minetest.set_node(pos, {name = name .. "_burning"})
+		minetest.swap_node(pos, {name = name .. "_burning"})
+		minetest.sound_play("tnt_ignite", {pos = pos}, true)
 		minetest.get_node_timer(pos):start(1)
 	end
 end
 
-local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast)
+local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast, owner, explode_center)
 	pos = vector.round(pos)
 	-- scan for adjacent TNT nodes first, and enlarge the explosion
 	local vm1 = VoxelManip()
@@ -286,6 +296,10 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast)
 	local c_tnt_burning = minetest.get_content_id("tnt:tnt_burning")
 	local c_tnt_boom = minetest.get_content_id("tnt:boom")
 	local c_air = minetest.get_content_id("air")
+	-- make sure we still have explosion even when centre node isnt tnt related
+	if explode_center then
+		count = 1
+	end
 
 	for z = pos.z - 2, pos.z + 2 do
 	for y = pos.y - 2, pos.y + 2 do
@@ -333,7 +347,7 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast)
 			if cid ~= c_air then
 				data[vi] = destroy(drops, p, cid, c_air, c_fire,
 					on_blast_queue, on_construct_queue,
-					ignore_protection, ignore_on_blast)
+					ignore_protection, ignore_on_blast, owner)
 			end
 		end
 		vi = vi + 1
@@ -375,16 +389,28 @@ local function tnt_explode(pos, radius, ignore_protection, ignore_on_blast)
 		queued_data.fn(queued_data.pos)
 	end
 
+	minetest.log("action", "TNT owned by " .. owner .. " detonated at " ..
+		minetest.pos_to_string(pos) .. " with radius " .. radius)
+
 	return drops, radius
 end
 
 function tnt.boom(pos, def)
-	minetest.sound_play("tnt_explode", {pos = pos, gain = 1.5, max_hear_distance = 2*64})
+	def = def or {}
+	def.radius = def.radius or 1
+	def.damage_radius = def.damage_radius or def.radius * 2
+	local meta = minetest.get_meta(pos)
+	local owner = meta:get_string("owner")
+	if not def.explode_center then
 		minetest.set_node(pos, {name = "tnt:boom"})
+	end
+	local sound = def.sound or "tnt_explode"
+	minetest.sound_play(sound, {pos = pos, gain = 2.5,
+			max_hear_distance = math.min(def.radius * 20, 128)}, true)
 	local drops, radius = tnt_explode(pos, def.radius, def.ignore_protection,
-			def.ignore_on_blast)
+			def.ignore_on_blast, owner, def.explode_center)
 	-- append entity drops
-	local damage_radius = (radius / def.radius) * def.damage_radius
+	local damage_radius = (radius / math.max(1, def.radius)) * def.damage_radius
 	entity_physics(pos, damage_radius, drops)
 	if not def.disable_drops then
 		eject_drops(drops, pos, radius)
@@ -400,18 +426,12 @@ minetest.register_node("tnt:boom", {
 	walkable = false,
 	drop = "",
 	groups = {dig_immediate = 3},
-	on_construct = function(pos)
-		minetest.get_node_timer(pos):start(0.4)
-	end,
-	on_timer = function(pos, elapsed)
-		minetest.remove_node(pos)
-	end,
 	-- unaffected by explosions
 	on_blast = function() end,
 })
 
 minetest.register_node("tnt:gunpowder", {
-	description = "Gun Powder",
+	description = S("Gun Powder"),
 	drawtype = "raillike",
 	paramtype = "light",
 	is_ground_content = false,
@@ -508,8 +528,8 @@ minetest.register_node("tnt:gunpowder_burning", {
 	on_timer = function(pos, elapsed)
 		for dx = -1, 1 do
 		for dz = -1, 1 do
+			if math.abs(dx) + math.abs(dz) == 1 then
 				for dy = -1, 1 do
-			if not (dx == 0 and dz == 0) then
 					tnt.burn({
 						x = pos.x + dx,
 						y = pos.y + dy,
@@ -524,7 +544,8 @@ minetest.register_node("tnt:gunpowder_burning", {
 	-- unaffected by explosions
 	on_blast = function() end,
 	on_construct = function(pos)
-		minetest.sound_play("tnt_gunpowder_burning", {pos = pos, gain = 2})
+		minetest.sound_play("tnt_gunpowder_burning", {pos = pos,
+			gain = 2}, true)
 		minetest.get_node_timer(pos):start(1)
 	end,
 })
@@ -535,13 +556,28 @@ minetest.register_craft({
 	recipe = {"default:coal_lump", "default:gravel"}
 })
 
+minetest.register_craftitem("tnt:tnt_stick", {
+	description = S("TNT Stick"),
+	inventory_image = "tnt_tnt_stick.png",
+	groups = {flammable = 5},
+})
+
 if enable_tnt then
+	minetest.register_craft({
+		output = "tnt:tnt_stick 2",
+		recipe = {
+			{"tnt:gunpowder", "", "tnt:gunpowder"},
+			{"tnt:gunpowder", "default:paper", "tnt:gunpowder"},
+			{"tnt:gunpowder", "", "tnt:gunpowder"},
+		}
+	})
+
 	minetest.register_craft({
 		output = "tnt:tnt",
 		recipe = {
-			{"group:wood",    "tnt:gunpowder", "group:wood"},
-			{"tnt:gunpowder", "tnt:gunpowder", "tnt:gunpowder"},
-			{"group:wood",    "tnt:gunpowder", "group:wood"}
+			{"tnt:tnt_stick", "tnt:tnt_stick", "tnt:tnt_stick"},
+			{"tnt:tnt_stick", "tnt:tnt_stick", "tnt:tnt_stick"},
+			{"tnt:tnt_stick", "tnt:tnt_stick", "tnt:tnt_stick"}
 		}
 	})
 
@@ -579,9 +615,16 @@ function tnt.register_tnt(def)
 			is_ground_content = false,
 			groups = {dig_immediate = 2, mesecon = 2, tnt = 1, flammable = 5},
 			sounds = default.node_sound_wood_defaults(),
+			after_place_node = function(pos, placer)
+				if placer:is_player() then
+					local meta = minetest.get_meta(pos)
+					meta:set_string("owner", placer:get_player_name())
+				end
+			end,
 			on_punch = function(pos, node, puncher)
 				if puncher:get_wielded_item():get_name() == "default:torch" then
-					minetest.set_node(pos, {name = name .. "_burning"})
+					minetest.swap_node(pos, {name = name .. "_burning"})
+					minetest.registered_nodes[name .. "_burning"].on_construct(pos)
 					minetest.log("action", puncher:get_player_name() ..
 						" ignites " .. node.name .. " at " ..
 						minetest.pos_to_string(pos))
@@ -600,10 +643,12 @@ function tnt.register_tnt(def)
 				}
 			},
 			on_burn = function(pos)
-				minetest.set_node(pos, {name = name .. "_burning"})
+				minetest.swap_node(pos, {name = name .. "_burning"})
+				minetest.registered_nodes[name .. "_burning"].on_construct(pos)
 			end,
 			on_ignite = function(pos, igniter)
-				minetest.set_node(pos, {name = name .. "_burning"})
+				minetest.swap_node(pos, {name = name .. "_burning"})
+				minetest.registered_nodes[name .. "_burning"].on_construct(pos)
 			end,
 		})
 	end
@@ -631,7 +676,7 @@ function tnt.register_tnt(def)
 		-- unaffected by explosions
 		on_blast = function() end,
 		on_construct = function(pos)
-			minetest.sound_play("tnt_ignite", {pos = pos})
+			minetest.sound_play("tnt_ignite", {pos = pos}, true)
 			minetest.get_node_timer(pos):start(4)
 			minetest.check_for_falling(pos)
 		end,
@@ -640,6 +685,6 @@ end
 
 tnt.register_tnt({
 	name = "tnt:tnt",
-	description = "TNT",
+	description = S("TNT"),
 	radius = tnt_radius,
 })

license.txt

@@ -26,15 +26,17 @@ DEALINGS IN THE SOFTWARE.
 For more details:
 https://opensource.org/licenses/MIT
 
+===================================
 
-Licenses of media (textures)
-----------------------------
+Licenses of media
+-----------------
 
 Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)
 Copyright (C) 2014-2016 BlockMen
 Copyright (C) 2014-2016 ShadowNinja
 Copyright (C) 2015-2016 Wuzzy
 Copyright (C) 2016 sofar (sofar@foo-projects.org)
+Copyright (C) 2018 paramat
 
 You are free to:
 Share — copy and redistribute the material in any medium or format.
@@ -63,3 +65,36 @@ rights may limit how you use the material.
 
 For more details:
 http://creativecommons.org/licenses/by-sa/3.0/
+
+====================================================
+
+CC0 1.0 Universal (CC0 1.0) Public Domain Dedication 
+for audio files (found in sounds folder)
+TumeniNodes
+steveygos93
+theneedle.tv
+frankelmedico
+
+No Copyright
+
+The person who associated a work with this deed has dedicated the work to the public domain
+by waiving all of his or her rights to the work worldwide under copyright law, including all
+related and neighboring rights, to the extent allowed by law.
+
+You can copy, modify, distribute and perform the work, even for commercial purposes, all
+without asking permission. See Other Information below.
+
+In no way are the patent or trademark rights of any person affected by CC0, nor are the
+rights that other persons may have in the work or in how the work is used, such as publicity
+or privacy rights.
+
+Unless expressly stated otherwise, the person who associated a work with this deed makes no
+warranties about the work, and disclaims liability for all uses of the work, to the fullest
+extent permitted by applicable law.
+
+When using or citing the work, you should not imply endorsement by the author or the affirmer.
+
+This license is acceptable for Free Cultural Works.
+For more Information:
+https://creativecommons.org/publicdomain/zero/1.0/
+

locale/template.txt

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=
+TNT Stick=
+TNT=

locale/tnt.de.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Schießpulver
+TNT Stick=TNT-Stange
+TNT=TNT

locale/tnt.es.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Pólvora
+TNT Stick=Cartucho de TNT
+TNT=TNT

locale/tnt.fr.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Poudre à canon
+TNT Stick=Bâton de TNT
+TNT=TNT

locale/tnt.it.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Polvere da sparo
+TNT Stick=Candelotto di TNT
+TNT=TNT

locale/tnt.ms.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Serbuk Senjata Api
+TNT Stick=Batang TNT
+TNT=TNT

locale/tnt.ru.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Порох
+TNT Stick=Тротиловая Палка
+TNT=Тротил

locale/tnt.se.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=Krut
+TNT Stick=Dynamitpinne
+TNT=Dynamit

locale/tnt.zh_CN.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=火药粉
+TNT Stick=炸药棒
+TNT=炸药包

locale/tnt.zh_TW.tr

@@ -0,0 +1,4 @@
+# textdomain: tnt
+Gun Powder=火藥粉
+TNT Stick=炸藥棒
+TNT=炸藥包

mod.conf

@@ -0,0 +1,3 @@
+name = tnt
+description = Minetest Game mod: tnt
+depends = default, fire