Require non-nulls.

getInventory never returns null.
BentoBoxWorld · Apr 16, 2022 · 6c09155 · 6c09155
1 parent 37d2039
commit 6c09155
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java b/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
@@ -561,8 +561,8 @@ else if (removeAmount >= statistic)
                                 // cannot punish null or player who already was punished.
                                 continue;
                             }
-
-                            switch (requirements.getStatistic().getType())
+                            
+                            switch (Objects.requireNonNull(requirements.getStatistic()).getType())
                             {
                                 case UNTYPED -> {
                                     int statistic = player.getStatistic(requirements.getStatistic());
@@ -877,12 +877,7 @@ private ChallengeResult checkInventory(int maxTimes)
             {
                 int numInInventory;
 
-                if (this.user.getInventory() == null)
-                {
-                    // Sanity check. User always has inventory at this point of code.
-                    numInInventory = 0;
-                }
-                else if (this.getInventoryRequirements().getIgnoreMetaData().contains(required.getType()))
+                if (this.getInventoryRequirements().getIgnoreMetaData().contains(required.getType()))
                 {
                     numInInventory = Arrays.stream(this.user.getInventory().getContents()).
                         filter(Objects::nonNull).
@@ -1420,7 +1415,7 @@ private ChallengeResult checkStatistic(int factor)
             return EMPTY_RESULT;
         }
 
-        switch (requirements.getStatistic().getType())
+        switch (Objects.requireNonNull(requirements.getStatistic()).getType())
         {
             case UNTYPED -> currentValue =
                 this.manager.getStatisticData(this.user, this.world, requirements.getStatistic());