Merge branch 'develop'

Dylancyclone · May 9, 2024 · 939f9c2 · 939f9c2
2 parents 885447e + 6fd268c
commit 939f9c2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/changelog.txt b/changelog.txt
@@ -1,3 +1,6 @@
+5/8/2024 2.0.1:
+* Fix geometry error when decompiling a map saved in Hammer++
+
 5/24/2022 2.0.0:
 + Added GUI version of application. The GUI is accessible by double-clicking on the .jar file, while the CLI is still accessible through the terminal
 * Vertices that are within 0.2 units of each other will be merged together, greatly reducing the number of extraneous vertices when dealing with complex brushes

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.lathrum.VMF2OBJ</groupId>
 	<artifactId>VMF2OBJ</artifactId>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
 	<packaging>jar</packaging>
 
 	<name>VMF2OBJ</name>

diff --git a/src/main/java/com/lathrum/VMF2OBJ/dataStructure/map/VMF.java b/src/main/java/com/lathrum/VMF2OBJ/dataStructure/map/VMF.java
@@ -185,6 +185,7 @@ public static VMF parseVMF(String text) {
 
 					side = side.replaceAll(objectRegex, ",\"$1\":$2");
 					side = side.replaceAll(keyValueRegex, "$1:$2,");
+					side = side.replaceAll(objectCommaRegex, "},\"");
 					side = side.replaceAll(",,", ",");
 					if (disps != "") {
 						disps = "\"dispinfo\":" + disps.substring(0, disps.length() - 1) + "}";