From db61dec547f70888b01cd0f25f290acea0eb6936 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Fri, 25 Aug 2023 00:39:11 +0200 Subject: [PATCH] Fix bug --- .../formatting/MotorConfigurationSubstitutor.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/formatting/MotorConfigurationSubstitutor.java b/core/src/net/sf/openrocket/formatting/MotorConfigurationSubstitutor.java index 7b152be7a..9accb30d0 100644 --- a/core/src/net/sf/openrocket/formatting/MotorConfigurationSubstitutor.java +++ b/core/src/net/sf/openrocket/formatting/MotorConfigurationSubstitutor.java @@ -88,10 +88,12 @@ public class MotorConfigurationSubstitutor implements RocketSubstitutor { List separators = new ArrayList<>(); int lastEnd = 0; for (int i = 0; i < foundKeys.size() - 1; i++) { - int startOfNextKey = tagContent.indexOf(foundKeys.get(i + 1), lastEnd); - String separator = tagContent.substring(lastEnd + foundKeys.get(i).length(), startOfNextKey); + int startOfThisKey = tagContent.indexOf(foundKeys.get(i), lastEnd); + int endOfThisKey = startOfThisKey + foundKeys.get(i).length(); + int startOfNextKey = tagContent.indexOf(foundKeys.get(i + 1), endOfThisKey); + String separator = tagContent.substring(endOfThisKey, startOfNextKey); separators.add(separator); - lastEnd = startOfNextKey + foundKeys.get(i + 1).length(); + lastEnd = startOfNextKey; } // Continue with the original function