From 32f5383f3e801f803eb72b6ef78e6855a29dd78f Mon Sep 17 00:00:00 2001
From: 0ddlyoko <0ddlyokoOfficial@gmail.com>
Date: Tue, 31 Mar 2020 15:46:40 +0200
Subject: [PATCH] Try to fix NullPointerException for challenges

---
 .../challenge/challenge/ChallengeCategory.java         |  6 ++++--
 src/main/resources/challenges.yml                      | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/songoda/skyblock/challenge/challenge/ChallengeCategory.java b/src/main/java/com/songoda/skyblock/challenge/challenge/ChallengeCategory.java
index d9ea2086..7da312e4 100644
--- a/src/main/java/com/songoda/skyblock/challenge/challenge/ChallengeCategory.java
+++ b/src/main/java/com/songoda/skyblock/challenge/challenge/ChallengeCategory.java
@@ -54,8 +54,10 @@ public class ChallengeCategory {
 				lore = new ArrayList<>();
 			try {
 				// If an Exception occurs, we don't handle it here but in parent class
-				System.out.println(strItem);
-				Material item = CompatibleMaterial.getMaterial(strItem).getMaterial();
+				CompatibleMaterial compatibleMaterial = CompatibleMaterial.getMaterial(strItem);
+				if (compatibleMaterial == null)
+					throw new IllegalArgumentException("Item " + strItem + " isn't a correct material");
+				Material item = compatibleMaterial.getMaterial();
 				if (item == null)
 					throw new IllegalArgumentException("Item " + strItem + " isn't a correct material");
 				ItemChallenge ic = new ItemChallenge(show, row, col, item, amount, lore);
diff --git a/src/main/resources/challenges.yml b/src/main/resources/challenges.yml
index b9f2b07a..658227eb 100644
--- a/src/main/resources/challenges.yml
+++ b/src/main/resources/challenges.yml
@@ -388,7 +388,7 @@ challenges:
         id: 3
         name: '&2A Prickly Affair'
         require:
-          - 'ITEM:cactus_green 48'
+          - 'ITEM:green_dye 48'
         reward:
           - 'CMD:eco give {player} 200'
           - 'ITEM:sand 24'
@@ -398,7 +398,7 @@ challenges:
           show: true
           row: 1
           col: 5
-          item: cactus_green
+          item: green_dye
           amount: 1
           lore:
             - '&c&lFor this challenge, you''ll need:'
@@ -1368,8 +1368,8 @@ challenges:
         id: 2
         name: '&2Artist'
         require:
-          - 'ITEM:rose_red 64'
-          - 'ITEM:cactus_green 64'
+          - 'ITEM:red_dye 64'
+          - 'ITEM:green_dye 64'
           - 'ITEM:purple_dye 64'
           - 'ITEM:cyan_dye 64'
           - 'ITEM:light_gray_dye 64'
@@ -1393,7 +1393,7 @@ challenges:
           show: true
           row: 1
           col: 4
-          item: dandelion_yellow
+          item: YELLOW_DYE
           amount: 1
           lore:
             - '&c&lFor this challenge, you''ll need:'