From a73165353fba19d3bd366df982433d4a939db748 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 21 Jan 2021 14:45:43 -0500 Subject: [PATCH] Fixed #4402 --- core/src/mindustry/world/blocks/power/PowerNode.java | 9 ++++++--- fastlane/metadata/android/en-US/changelogs/29804.txt | 6 ++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/29804.txt diff --git a/core/src/mindustry/world/blocks/power/PowerNode.java b/core/src/mindustry/world/blocks/power/PowerNode.java index c9f372a314..0457d16f79 100644 --- a/core/src/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/mindustry/world/blocks/power/PowerNode.java @@ -221,12 +221,15 @@ public class PowerNode extends PowerBlock{ @Override public void drawRequestConfigTop(BuildPlan req, Eachable list){ - if(req.config instanceof Point2[]){ + if(req.config instanceof Point2[] ps){ setupColor(1f); - for(Point2 point : (Point2[])req.config){ + for(Point2 point : ps){ + int px = req.x + point.x, py = req.y + point.y; otherReq = null; list.each(other -> { - if((other.x == req.x + point.x && other.y == req.y + point.y) && other != req && other.block != null && other.block.hasPower){ + if(other.block != null + && (px >= other.x - ((other.block.size-1)/2) && py >= other.y - ((other.block.size-1)/2) && px <= other.x + other.block.size/2 && py <= other.y + other.block.size/2) + && other != req && other.block.hasPower){ otherReq = other; } }); diff --git a/fastlane/metadata/android/en-US/changelogs/29804.txt b/fastlane/metadata/android/en-US/changelogs/29804.txt new file mode 100644 index 0000000000..ef9e5b2b4f --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/29804.txt @@ -0,0 +1,6 @@ +[This is a truncated changelog, see Github for full notes] +- Fixed negative numbers not displaying properly in power nodes +- Fixed mod minVersion parsing +- Fixed mods disappearing after import [Android] +- Disabled duplicate IP prevention system +- Added mod browser sort order button