From eb66059f5caf74c461c5683d7e0c81c96a334993 Mon Sep 17 00:00:00 2001 From: Taka Date: Thu, 2 Jul 2020 12:06:03 +0000 Subject: [PATCH] Changed how we detect labels in a VASL scenario save file. --- vassal-shim/release/vassal-shim.jar | Bin 30002 -> 30016 bytes vassal-shim/src/vassal_shim/VassalShim.java | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vassal-shim/release/vassal-shim.jar b/vassal-shim/release/vassal-shim.jar index 8054b53a848ea7182b0c3fa23b6f56586b7be31b..a5b4dfea86dee52d61b8a4da6e9e09c96c491fa4 100644 GIT binary patch delta 14544 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 SZ`(@3aHWK){C7ZLVE-S32L@~a diff --git a/vassal-shim/src/vassal_shim/VassalShim.java b/vassal-shim/src/vassal_shim/VassalShim.java index 0fade33..471e003 100644 --- a/vassal-shim/src/vassal_shim/VassalShim.java +++ b/vassal-shim/src/vassal_shim/VassalShim.java @@ -306,9 +306,9 @@ public class VassalShim // http://www.gamesquad.com/forums/index.php?threads/new-program-to-help-set-up-vasl-scenarios.148281/post-1983751 if ( cmd instanceof AddPiece ) { AddPiece addPieceCmd = (AddPiece) cmd ; - if ( addPieceCmd.getTarget() instanceof DynamicProperty ) { - GamePiece target = addPieceCmd.getTarget() ; - // NOTE: We can't check for target.getName() == "User-Labeled", it seems to get changed to the first label :shrug: + GamePiece target = addPieceCmd.getTarget() ; + GamePiece gamePiece = Decorator.getInnermost( target ) ; + if ( gamePiece.getName().equals( "User-Labeled" ) ) { // yup - parse the label content ArrayList separators = new ArrayList() ;