Merge pull request #6174 from Abextm/fix-region-loading

cache: Correct Location loading

cache/src/main/java/net/runelite/cache/definitions/loaders/LocationsLoader.java

@@ -47,7 +47,7 @@ public class LocationsLoader
 		int id = -1;
 		int idOffset;
 
-		while ((idOffset = buf.readUnsignedShortSmart()) != 0)
+		while ((idOffset = buf.readUnsignedIntSmartShortCompat()) != 0)
 		{
 			id += idOffset;
 

cache/src/main/java/net/runelite/cache/io/InputStream.java

@@ -157,11 +157,25 @@ public class InputStream extends java.io.InputStream
 		return peek < 128 ? this.readUnsignedByte() : this.readUnsignedShort() - 0x8000;
 	}
 
+	public int readUnsignedIntSmartShortCompat()
+	{
+		int var1 = 0;
+
+		int var2;
+		for (var2 = this.readUnsignedShortSmart(); var2 == 32767; var2 = this.readUnsignedShortSmart())
+		{
+			var1 += 32767;
+		}
+
+		var1 += var2;
+		return var1;
+	}
+
 	public String readString()
 	{
 		StringBuilder sb = new StringBuilder();
 
-		for (;;)
+		for (; ; )
 		{
 			int ch = this.readUnsignedByte();