From fb32b5842d03ee80a27dddc2cfa37bed7004f0de Mon Sep 17 00:00:00 2001
From: Max Weber <mii7303@gmail.com>
Date: Thu, 7 May 2020 14:19:26 -0600
Subject: [PATCH] cache: emit null npc ids

---
 .../java/net/runelite/cache/ItemManager.java  | 20 +++++++++----------
 .../java/net/runelite/cache/NpcManager.java   | 11 ++++++----
 .../net/runelite/cache/ObjectManager.java     | 20 +++++++++----------
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/cache/src/main/java/net/runelite/cache/ItemManager.java b/cache/src/main/java/net/runelite/cache/ItemManager.java
index b3449a51a4..bff27593d6 100644
--- a/cache/src/main/java/net/runelite/cache/ItemManager.java
+++ b/cache/src/main/java/net/runelite/cache/ItemManager.java
@@ -96,20 +96,18 @@ public class ItemManager implements ItemProvider
 	public void java(File java) throws IOException
 	{
 		java.mkdirs();
-		try (IDClass ids = IDClass.create(java, "ItemID"))
+		try (IDClass ids = IDClass.create(java, "ItemID");
+			IDClass nulls = IDClass.create(java, "NullItemID"))
 		{
-			try (IDClass nulls = IDClass.create(java, "NullItemID"))
+			for (ItemDefinition def : items.values())
 			{
-				for (ItemDefinition def : items.values())
+				if (def.name.equalsIgnoreCase("NULL"))
 				{
-					if (def.name.equalsIgnoreCase("NULL"))
-					{
-						nulls.add(def.name, def.id);
-					}
-					else
-					{
-						ids.add(def.name, def.id);
-					}
+					nulls.add(def.name, def.id);
+				}
+				else
+				{
+					ids.add(def.name, def.id);
 				}
 			}
 		}
diff --git a/cache/src/main/java/net/runelite/cache/NpcManager.java b/cache/src/main/java/net/runelite/cache/NpcManager.java
index 3124eb455f..04849de69f 100644
--- a/cache/src/main/java/net/runelite/cache/NpcManager.java
+++ b/cache/src/main/java/net/runelite/cache/NpcManager.java
@@ -95,16 +95,19 @@ public class NpcManager
 	public void java(File java) throws IOException
 	{
 		java.mkdirs();
-		try (IDClass ids = IDClass.create(java, "NpcID"))
+		try (IDClass ids = IDClass.create(java, "NpcID");
+			IDClass nulls = IDClass.create(java, "NullNpcID"))
 		{
 			for (NpcDefinition def : npcs.values())
 			{
 				if (def.name.equalsIgnoreCase("NULL"))
 				{
-					continue;
+					nulls.add(def.name, def.id);
+				}
+				else
+				{
+					ids.add(def.name, def.id);
 				}
-
-				ids.add(def.name, def.id);
 			}
 		}
 	}
diff --git a/cache/src/main/java/net/runelite/cache/ObjectManager.java b/cache/src/main/java/net/runelite/cache/ObjectManager.java
index cb1372ed65..ba39ae9239 100644
--- a/cache/src/main/java/net/runelite/cache/ObjectManager.java
+++ b/cache/src/main/java/net/runelite/cache/ObjectManager.java
@@ -95,20 +95,18 @@ public class ObjectManager
 	public void java(File java) throws IOException
 	{
 		java.mkdirs();
-		try (IDClass ids = IDClass.create(java, "ObjectID"))
+		try (IDClass ids = IDClass.create(java, "ObjectID");
+			IDClass nulls = IDClass.create(java, "NullObjectID"))
 		{
-			try (IDClass nulls = IDClass.create(java, "NullObjectID"))
+			for (ObjectDefinition def : objects.values())
 			{
-				for (ObjectDefinition def : objects.values())
+				if ("null".equals(def.getName()))
 				{
-					if ("null".equals(def.getName()))
-					{
-						nulls.add(def.getName(), def.getId());
-					}
-					else
-					{
-						ids.add(def.getName(), def.getId());
-					}
+					nulls.add(def.getName(), def.getId());
+				}
+				else
+				{
+					ids.add(def.getName(), def.getId());
 				}
 			}
 		}