Fix NPE

gamerforEA · Aug 3, 2019 · a525379 · a525379
1 parent b0bcd32
commit a525379
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/main/java/com/gamerforea/minetuner/client/model/DisplayListedWavefrontObject.java b/src/main/java/com/gamerforea/minetuner/client/model/DisplayListedWavefrontObject.java
@@ -86,7 +86,7 @@ public void renderPart(String partName)
 		{
 			for (Map.Entry<String, Integer> entry : this.lists.entrySet())
 			{
-				if (entry.getKey().equalsIgnoreCase(partName))
+				if (partName.equalsIgnoreCase(entry.getKey()))
 				{
 					listId = entry.getValue();
 					this.lists.put(partName, listId);
@@ -105,6 +105,9 @@ public void renderAllExcept(String... excludedGroupNames)
 		for (Map.Entry<String, Integer> entry : this.lists.entrySet())
 		{
 			String groupName = entry.getKey();
+			if (groupName == null)
+				continue;
+
 			boolean skipPart = false;
 
 			for (String excludedGroupName : excludedGroupNames)

diff --git a/src/main/java/com/gamerforea/minetuner/client/model/DisplayListedWavefrontObjectWrapper.java b/src/main/java/com/gamerforea/minetuner/client/model/DisplayListedWavefrontObjectWrapper.java
@@ -78,7 +78,7 @@ public void renderPart(String partName)
 		{
 			for (Map.Entry<String, Integer> entry : this.lists.entrySet())
 			{
-				if (entry.getKey().equalsIgnoreCase(partName))
+				if (partName.equalsIgnoreCase(entry.getKey()))
 				{
 					listId = entry.getValue();
 					this.lists.put(partName, listId);
@@ -97,6 +97,9 @@ public void renderAllExcept(String... excludedGroupNames)
 		for (Map.Entry<String, Integer> entry : this.lists.entrySet())
 		{
 			String groupName = entry.getKey();
+			if (groupName == null)
+				continue;
+
 			boolean skipPart = false;
 
 			for (String excludedGroupName : excludedGroupNames)