From 1c45af24044762bc2a488632988f9a66833235b6 Mon Sep 17 00:00:00 2001
From: Owain van Brakel <owain.vanbrakel@gmail.com>
Date: Thu, 15 Aug 2019 23:47:59 +0200
Subject: [PATCH] wiki-scraper/cache: Fix NPE

---
 .../net/runelite/cache/fs/jagex/DiskStorage.java | 15 +++++++++++++--
 .../src/main/java/net/runelite/data/App.java     | 16 +++++++++++++---
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java b/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
index bebcc9711f..42fd8d9b0c 100644
--- a/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
+++ b/cache/src/main/java/net/runelite/cache/fs/jagex/DiskStorage.java
@@ -112,8 +112,13 @@ public class DiskStorage implements Storage
 	public byte[] readIndex(int indexId) throws IOException
 	{
 		IndexEntry entry = index255.read(indexId);
-		byte[] indexData = data.read(index255.getIndexFileId(), entry.getId(), entry.getSector(), entry.getLength());
-		return indexData;
+		if (entry != null)
+		{
+			byte[] indexData = data.read(index255.getIndexFileId(), entry.getId(), entry.getSector(), entry.getLength());
+			return indexData;
+		}
+
+		return null;
 	}
 
 	private void loadIndex(Index index) throws IOException
@@ -121,6 +126,12 @@ public class DiskStorage implements Storage
 		logger.trace("Loading index {}", index.getId());
 
 		byte[] indexData = readIndex(index.getId());
+
+		if (indexData == null)
+		{
+			return;
+		}
+
 		Container res = Container.decompress(indexData, null);
 		byte[] data = res.data;
 
diff --git a/wiki-scraper/src/main/java/net/runelite/data/App.java b/wiki-scraper/src/main/java/net/runelite/data/App.java
index 263bb31125..523fa9b6e2 100644
--- a/wiki-scraper/src/main/java/net/runelite/data/App.java
+++ b/wiki-scraper/src/main/java/net/runelite/data/App.java
@@ -27,6 +27,9 @@ import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import net.runelite.cache.fs.Store;
 import net.runelite.data.dump.MediaWiki;
 import net.runelite.data.dump.wiki.NpcStatsDumper;
@@ -40,9 +43,16 @@ public class App
 
 	public static void main(String[] args) throws IOException
 	{
-		final File home = new File(System.getProperty("user.home"));
-		final Store cacheStore = new Store(new File(home,
-			"jagexcache" + File.separator + "oldschool" + File.separator + "LIVE"));
+		Path path = Paths.get(System.getProperty("user.home"), "jagexcache" + File.separator + "oldschool" + File.separator + "LIVE");
+		final File jagexcache = new File(String.valueOf(path));
+
+		if (!Files.exists(path))
+		{
+			return;
+		}
+
+		final Store cacheStore = new Store(jagexcache);
+
 		cacheStore.load();
 
 		// Try to make this go faster (probably not very smart)