From f8136aea5f1eb92000d1adb8f4959956cd7f36b8 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 2 May 2019 16:49:05 +0100 Subject: [PATCH] More 0.17.35 Fixs --- modules/addons/damage-popups.lua | 4 ++-- modules/addons/spawn-area.lua | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/addons/damage-popups.lua b/modules/addons/damage-popups.lua index 4233ac1d..1b879f85 100644 --- a/modules/addons/damage-popups.lua +++ b/modules/addons/damage-popups.lua @@ -21,9 +21,9 @@ Event.add(defines.events.on_entity_damaged, function(event) -- Sets the message local message - if entity.name == 'player' and config.show_player_health then + if entity.name == 'character' and config.show_player_health then message = {'damage-popup.player-health',health} - elseif entity.name ~= 'player' and cause and cause.name == 'player' and config.show_player_damage then + elseif entity.name ~= 'character' and cause and cause.name == 'character' and config.show_player_damage then message = {'damage-popup.player-damage',damage} end diff --git a/modules/addons/spawn-area.lua b/modules/addons/spawn-area.lua index 71f4d062..673f3a45 100644 --- a/modules/addons/spawn-area.lua +++ b/modules/addons/spawn-area.lua @@ -89,7 +89,7 @@ local function spawn_base(surface,position) table.insert(tiles_to_make,{name=dtile,position=p}) local entities_to_remove = surface.find_entities_filtered{area={{p.x-1,p.y-1},{p.x,p.y}}} for _,entity in pairs(entities_to_remove) do - if entity.name ~= 'player' then entity.destroy() end + if entity.name ~= 'character' then entity.destroy() end end elseif prod < pr2 then -- if it is inside the pattern radius