Call custom on_punched functions w/ hitter = nil too

minetest-mods · Mar 18, 2024 · 691036d · 691036d
1 parent 25369e5
commit 691036d
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/3d_armor/init.lua b/3d_armor/init.lua
@@ -394,14 +394,15 @@ end
 if armor.config.punch_damage == true then
 	minetest.register_on_punchplayer(function(player, hitter,
 			time_from_last_punch, tool_capabilities)
-		if hitter == nil then
-			return
-		end
 		local name = player:get_player_name()
-		local hit_ip = hitter:is_player()
-		if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
-			return
-		elseif name then
+		if hitter then
+			local hit_ip = hitter:is_player()
+			if name and hit_ip and minetest.is_protected(player:get_pos(), "") then
+				return
+			end
+		end
+
+		if name then
 			armor:punch(player, hitter, time_from_last_punch, tool_capabilities)
 			last_punch_time[name] = minetest.get_gametime()
 		end