From 792dcc03307431dcce3e65da70d762ff84e61016 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 22 Aug 2019 20:30:52 +0100 Subject: [PATCH 1/4] Fixed multiple spawn warps being created --- modules/gui/warp-list.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua index 9ba0a109..f14b2b7a 100644 --- a/modules/gui/warp-list.lua +++ b/modules/gui/warp-list.lua @@ -526,8 +526,10 @@ Event.add(defines.events.on_player_created,function(event) end local force = player.force - local spawn_position = force.get_spawn_position(player.surface) - Warps.new_warp(force.name,player.surface,spawn_position,nil,'Spawn',true,true) + if not Warps.forces[force.name] then + local spawn_position = force.get_spawn_position(player.surface) + Warps.new_warp(force.name,player.surface,spawn_position,nil,'Spawn',true,true) + end end) local function maintain_tag(event) From a7e6f155ae219162eb92a736dcb65f59c3075215 Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 22 Aug 2019 20:32:52 +0100 Subject: [PATCH 2/4] Fixed warp creation --- modules/gui/warp-list.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/gui/warp-list.lua b/modules/gui/warp-list.lua index f14b2b7a..4e06b335 100644 --- a/modules/gui/warp-list.lua +++ b/modules/gui/warp-list.lua @@ -120,7 +120,7 @@ end) local warps = Warps.get_all_warps() for warp_id,warp in pairs(warps) do local pos = warp.position - if (posx-pos.x)^2+(posy-pos.y)^2 < dist2 then + if (px-pos.x)^2+(py-pos.y)^2 < dist2 then local warp_name = Warps.get_warp_name(warp_id) player.print{'warp-list.too-close',warp_name} return From b95f6b99c478d8a5b3a04e97547a4b689d1de3ca Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 22 Aug 2019 20:36:35 +0100 Subject: [PATCH 3/4] Fixed destroy_if_valid for rocket gui --- modules/gui/rocket-info.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/gui/rocket-info.lua b/modules/gui/rocket-info.lua index e76c3936..fd384627 100644 --- a/modules/gui/rocket-info.lua +++ b/modules/gui/rocket-info.lua @@ -364,11 +364,11 @@ local function generate_progress(player,frame) local silo_name = silo_data.name if not silo_data.entity or not silo_data.entity.valid then force_silos[silo_name] = nil - Gui.destory_if_valid(element['toggle-'..silo_name]) - Gui.destory_if_valid(element['launch-'..silo_name]) - Gui.destory_if_valid(element['label-x-'..silo_name]) - Gui.destory_if_valid(element['label-y-'..silo_name]) - Gui.destory_if_valid(element[silo_name]) + Gui.destroy_if_valid(element['toggle-'..silo_name]) + Gui.destroy_if_valid(element['launch-'..silo_name]) + Gui.destroy_if_valid(element['label-x-'..silo_name]) + Gui.destroy_if_valid(element['label-y-'..silo_name]) + Gui.destroy_if_valid(element[silo_name]) elseif not element[silo_name] then local entity = silo_data.entity From db102a79ff2793e867c11b2c1e0f95c30d42b54b Mon Sep 17 00:00:00 2001 From: Cooldude2606 Date: Thu, 22 Aug 2019 20:44:01 +0100 Subject: [PATCH 4/4] Fixed instant respawn and death markers --- modules/commands/bonus.lua | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/commands/bonus.lua b/modules/commands/bonus.lua index f7d11038..918c458d 100644 --- a/modules/commands/bonus.lua +++ b/modules/commands/bonus.lua @@ -43,17 +43,10 @@ Event.add(defines.events.on_player_respawned,function(event) end end) -Event.add(defines.events.on_pre_player_died,function(event) +Event.add(defines.events.on_player_died,function(event) local player = Game.get_player_by_index(event.player_index) if Roles.player_has_flag(player,'instance-respawn') then player.ticks_to_respawn = 120 - -- manually dispatch death event because it is not fired when ticks_to_respawn is set pre death - Event.dispatch{ - name=defines.events.on_player_died, - tick=event.tick, - player_index=event.player_index, - cause = event.cause - } end end)