From fa96ed136ba926fba7c878bfc7610f58de1c367c Mon Sep 17 00:00:00 2001 From: Doug Rimmer Date: Thu, 30 Apr 2026 07:41:04 -0400 Subject: [PATCH] #2477 counter linking bug --- dist/buildFile | 2 +- dist/release-notes.md | 11 ++++++----- pom.xml | 2 +- src/VASL/build/module/map/PieceLinker.java | 7 ++++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/dist/buildFile b/dist/buildFile index b7f8b8ef6..dcf31dbac 100644 --- a/dist/buildFile +++ b/dist/buildFile @@ -1,5 +1,5 @@ - + diff --git a/dist/release-notes.md b/dist/release-notes.md index 63332d990..c0f78d558 100644 --- a/dist/release-notes.md +++ b/dist/release-notes.md @@ -1,5 +1,5 @@ -# Release Notes: Version 6.7.3 beta 1 -**Release Date:** April 29, 2026 +# Release Notes: Version 6.7.3-beta2 +**Release Date:** April 30, 2026 --- @@ -11,14 +11,15 @@ --- ## 🛠 Bug Fixes - - Fix 1: Counter Linking bug fixed - - Fix 2: Cows/Dead Cows now work with LOS Checking (you've been waiting for it, you know you have) + - Fix 1: Counter Linking bug fixed. + - Fix 2: Cows/Dead Cows now work with LOS Checking (you've been waiting for it, you know you have). + - Fix 3: LOS works when using NUL and/or NULV boards. --- ## 📈 Improvements - Improvement 1: Enabled beach slope options for BE, OC, and EF overlays. - Improvement 2: Enable Grain to Light Grain transformation for Slaughter at Ponyri (map-specific transformation) and "Light Grain" under "Other transformations" for Geoboards. - - Improvement 3: Counter Search Updated + - Improvement 3: Counter Search updated. - Improvement 4: - Improvement 5: - Improvement 6: diff --git a/pom.xml b/pom.xml index d2f0b95ed..5ae8cb331 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.vasl vasl - 6.7.3-beta1 + 6.7.3-beta2 jar diff --git a/src/VASL/build/module/map/PieceLinker.java b/src/VASL/build/module/map/PieceLinker.java index aacba21c0..8fd526bbe 100644 --- a/src/VASL/build/module/map/PieceLinker.java +++ b/src/VASL/build/module/map/PieceLinker.java @@ -227,7 +227,12 @@ public void draw(Graphics g, Map map1) { if (sourceonmap && targetonmap) { VASL.LOS.Map.Hex sourceHex = map.getVASLMap().gridToHex((int) (fromPiece.getPosition().getX() - map.getEdgeBuffer().getWidth()), (int) (fromPiece.getPosition().getY() - map.getEdgeBuffer().getHeight())); VASL.LOS.Map.Hex targetHex = map.getVASLMap().gridToHex((int) (toPiece.getPosition().getX() - map.getEdgeBuffer().getWidth()), (int) (toPiece.getPosition().getY() - map.getEdgeBuffer().getHeight())); - linkrange = map.getVASLMap().range(sourceHex, targetHex, map.getVASLMap().getMapConfiguration()); + if (sourceHex == null || targetHex == null){ + linkrange = 0; + } + else { + linkrange = map.getVASLMap().range(sourceHex, targetHex, map.getVASLMap().getMapConfiguration()); + } } else { linkrange =0;