fixed bug when it could not split on right place in string

broken1arrow · Jul 23, 2022 · ea11e7e · ea11e7e
1 parent 18c7bde
commit ea11e7e
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/src/main/java/org/broken/lib/rbg/TextTranslator.java b/src/main/java/org/broken/lib/rbg/TextTranslator.java
@@ -286,12 +286,12 @@ public String convertToMulitGradiens(GradientType type,String message) {
 
 			//MultiGradients multiGradients = new MultiGradients(striped, colorList, portionsList);
 			StringBuilder builder = new StringBuilder();
-			int end = getEndOfColor(message);
+			int end = getNextColor(message);
 			int nextEnd = getNextColor(message.substring(end + 1));
 			if (startIndex > 0)
 				builder.append(message, 0, startIndex);
-			builder.append(multiRgbGradient(type, message.substring(Math.max(startIndex, 0), nextEnd > 0 ? nextEnd : end > 0 ? end : message.length()), colorList, checkportions(colorList, portionsList)));
-			if (end > 0 || nextEnd > 0)
+			builder.append(multiRgbGradient(type, message.substring(Math.max(startIndex, 0), end > 0 ? end : message.length()), colorList, checkportions(colorList, portionsList)));
+			if (end > 0)
 				builder.append(message, Math.max(end, 0), message.length());
 			return builder.toString();
 
@@ -723,7 +723,14 @@ public static String getHexFromString(String hex, int from) {
 	}
 
 	public static int getNextColor(String subMessage) {
-		return Math.min(subMessage.indexOf("<#"), checkIfContainsColor(subMessage));
+		int nextGrad = subMessage.indexOf("<#");
+		int vanillaColor = checkIfContainsColor(subMessage);
+		if (nextGrad < 0)
+			return vanillaColor;
+		if (vanillaColor < 0)
+			return nextGrad;
+
+		return Math.min(nextGrad, vanillaColor);
 	}
 
 	public static int getEndOfColor(String subMessage) {