aperx/factorio-scenario-ExpCluster
1
0
Fork 0
mirror of https://github.com/PHIDIAS0303/ExpCluster.git synced 2025-12-30 20:41:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix warp list crashing if no warp found

Browse Source
This commit is contained in:
oof2win2
2021-09-26 19:33:44 +00:00
parent 8108bd1127
commit 8b76fa245f
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
modules/gui/warp-list.lua
View File

@@ -793,28 +793,29 @@ Event.on_nth_tick(math.floor(60/config.update_smoothing), function()
end end
end end
-- Check the dist to the closest warp if closest_warp then
local in_range = closest_warp.warp_id == warp_ids.spawn and closest_distance < rs2 or closest_distance < r2 -- Check the dist to the closest warp
if was_in_range and not in_range then local in_range = closest_warp.warp_id == warp_ids.spawn and closest_distance < rs2 or closest_distance < r2
PlayerInRange:set(player, nil) if was_in_range and not in_range then
elseif not was_in_range and in_range then PlayerInRange:set(player, nil)
PlayerInRange:set(player, closest_warp.warp_id) elseif not was_in_range and in_range then
end PlayerInRange:set(player, closest_warp.warp_id)
end
-- Change the enabled state of the add warp button -- Change the enabled state of the add warp button
local frame = Gui.get_left_element(player, warp_list_container) local frame = Gui.get_left_element(player, warp_list_container)
local add_warp_element = frame.container.header.alignment[add_new_warp.name] local add_warp_element = frame.container.header.alignment[add_new_warp.name]
local old_closest_warp_name = add_warp_element.tooltip[2] or closest_warp.name local old_closest_warp_name = add_warp_element.tooltip[2] or closest_warp.name
local was_able_to_make_warp = add_warp_element.enabled local was_able_to_make_warp = add_warp_element.enabled
local can_make_warp = closest_distance > mr2 local can_make_warp = closest_distance > mr2
if can_make_warp and not was_able_to_make_warp then if can_make_warp and not was_able_to_make_warp then
add_warp_element.enabled = true add_warp_element.enabled = true
add_warp_element.tooltip = {'warp-list.add-tooltip'} add_warp_element.tooltip = {'warp-list.add-tooltip'}
elseif not can_make_warp and was_able_to_make_warp or old_closest_warp_name ~= closest_warp.name then elseif not can_make_warp and was_able_to_make_warp or old_closest_warp_name ~= closest_warp.name then
add_warp_element.enabled = false add_warp_element.enabled = false
add_warp_element.tooltip = {'warp-list.too-close', closest_warp.name} add_warp_element.tooltip = {'warp-list.too-close', closest_warp.name}
end
end end
end end
end end