Merge branch 'mc/1.13' into mc/1.12

TBlueF · TBlueF · commit 533d5e86beed · 2020-03-26T12:08:18.000+01:00
diff --git a/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/fileaccess/FolderFileAccess.java b/BlueMapCore/src/main/java/de/bluecolored/bluemap/core/resourcepack/fileaccess/FolderFileAccess.java
@@ -113,6 +113,7 @@ private synchronized void tidy() {
 	}
 	
 	private Path resolve(String path) {
+		if (path.isEmpty() || "/".equals(path)) return folder.toPath();
 		if (File.separatorChar != '/') path = path.replace('/', File.separatorChar);
 		if (path.charAt(0) == '/') path = path.substring(1);
 		Path resolve = folder.toPath();

Original file line number	Diff line number	Diff line change
`@@ -113,6 +113,7 @@ private synchronized void tidy() {`
`113`	`113`	`}`
`114`	`114`
`115`	`115`	`private Path resolve(String path) {`
	`116`	`+ if (path.isEmpty() \|\| "/".equals(path)) return folder.toPath();`
`116`	`117`	`if (File.separatorChar != '/') path = path.replace('/', File.separatorChar);`
`117`	`118`	`if (path.charAt(0) == '/') path = path.substring(1);`
`118`	`119`	`Path resolve = folder.toPath();`