From 9e1c3717a00377612756d44f801fffb460a40ca8 Mon Sep 17 00:00:00 2001
From: Ginger88895 <soft_ginger@live.cn>
Date: Tue, 22 Sep 2015 07:13:57 +0000
Subject: [PATCH] Blaze!

---
 bettertnt/init.lua  | 43 +++++++++++++++++++++----------------------
 checkertnt/init.lua |  1 +
 napalmtnt/init.lua  | 22 +++++++++-------------
 3 files changed, 31 insertions(+), 35 deletions(-)

diff --git a/bettertnt/init.lua b/bettertnt/init.lua
index f5bce29..77a9bdd 100644
--- a/bettertnt/init.lua
+++ b/bettertnt/init.lua
@@ -179,33 +179,32 @@ function boom_bettertnt_id(pos, time, player, id)
 		end
 		
 		local storedPoses = {}
+		local ts = tnt_range * tnt_range
 		
 		if id~="bettertnt:tnt1" then
 			for dx=-tnt_range,tnt_range do
-				for dz=-tnt_range,tnt_range do
-					for dy=-tnt_range,tnt_range do
+				local zm=(ts-dx*dx)^(1/2.0)
+				for dz=-zm,zm do
+					local ym=(ts-dx*dx-dz*dz)^(1/2.0)
+					for dy=-ym,ym do
 						local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
 						----------------------------------------
-						local dist = (dx^2) + (dy^2) + (dz^2)
-						dist = dist^(1/2.0)
-						if dist <= tnt_range then
-							--local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-							--vector.add(p, dir)
-							----------------------------------------
-	--							local p_node = area:index(p.x, p.y, p.z)
-	--							local d_p_node = nodes[p_node]
-							local node = minetest.get_node(p)
-							local nodename = node.name
-							if is_tnt(nodename)==true then
-								minetest.remove_node(p)
-								boom_bettertnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
-							elseif nodename~="air" then
-								--if math.abs(dx)<tnt_range and math.abs(dy)<tnt_range and math.abs(dz)<tnt_range then
-								minetest.remove_node(p)
-								--elseif pr:next(1,5) <= 4 then
-								--	destroy(p, player, ents)
-								--end
-							end
+						--local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+						--vector.add(p, dir)
+						----------------------------------------
+--							local p_node = area:index(p.x, p.y, p.z)
+--							local d_p_node = nodes[p_node]
+						local node = minetest.get_node(p)
+						local nodename = node.name
+						if is_tnt(nodename)==true then
+							minetest.remove_node(p)
+							boom_bettertnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
+						elseif nodename~="air" then
+							--if math.abs(dx)<tnt_range and math.abs(dy)<tnt_range and math.abs(dz)<tnt_range then
+							minetest.remove_node(p)
+							--elseif pr:next(1,5) <= 4 then
+							--	destroy(p, player, ents)
+							--end
 						end
 					end
 				end
diff --git a/checkertnt/init.lua b/checkertnt/init.lua
index 4cecefc..aeec764 100644
--- a/checkertnt/init.lua
+++ b/checkertnt/init.lua
@@ -185,6 +185,7 @@ function boom_checkertnt_id(pos, time, player, id)
 				for dz=-tnt_range,tnt_range do
 					for dy=-tnt_range,tnt_range do
 						local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
+						local nodename = minetest.get_node(p).name
 						if is_tnt(nodename)==true then
 							minetest.remove_node(p)
 							boom_checkertnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
diff --git a/napalmtnt/init.lua b/napalmtnt/init.lua
index 236f26d..fe339dc 100644
--- a/napalmtnt/init.lua
+++ b/napalmtnt/init.lua
@@ -165,22 +165,18 @@ function boom_napalmtnt_id(pos, time, player, id)
 		
 		local storedPoses = {}
 		local dy = 0
+		local ts = tnt_range * tnt_range
 		
 		for dx=-tnt_range,tnt_range do
-			for dz=-tnt_range,tnt_range do
+			local zm=(ts-dx*dx)^(1/2.0)
+			for dz=-zm,zm do
 				local p = {x=pos.x+dx, y=pos.y+dy, z=pos.z+dz}
-				----------------------------------------
-				local dist = (dx^2) + (dy^2) + (dz^2)
-				dist = dist^(1/2.0)
-				if dist <= tnt_range then
-					local node = minetest.get_node(p)
-					local nodename = node.name
-					if is_tnt(nodename)==true then
-						minetest.set_node(p,{name="fire:basic_flame"})
-						boom_napalmtnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
-					else
-						minetest.set_node(p,{name="fire:basic_flame"})
-					end
+				local nodename = minetest.get_node(p).name
+				if is_tnt(nodename)==true then
+					minetest.set_node(p,{name="fire:basic_flame"})
+					boom_napalmtnt_id(p, 0.5, player, nodename) -- was {x=p.x, y=p.y, z=p.z}
+				else
+					minetest.set_node(p,{name="fire:basic_flame"})
 				end
 			end
 		end