Merge remote-tracking branch 'origin/master'

2019-06-27 17:14:49 -04:00
parent 8543e13908 a6395ccc29
commit c71f40caf5
351 changed files with 9231 additions and 6230 deletions
--- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
+++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java
@@ -268,7 +268,15 @@ public class RuneLiteAPI
 	{
 		try
 		{
-			String jsonData = new String(downloadUrl(new URL(GITHUB_API)));
+			byte[] commits = downloadUrl(new URL(GITHUB_API));
+
+			if (commits == null)
+			{
+				return null;
+			}
+
+			String jsonData = new String(commits);
+
 			for (String s : jsonData.split("\n"))
 			{
 				if (s.startsWith("\"sha\":"))