raids: Null checks

This commit is contained in:
sdburns1998
2019-07-07 18:07:20 +02:00
parent ae438912b7
commit 605fe3a4fb

View File

@@ -33,6 +33,7 @@ import java.awt.image.BufferedImage;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.Set; import java.util.Set;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Singleton; import javax.inject.Singleton;
@@ -177,7 +178,7 @@ public class RaidsOverlay extends Overlay
case COMBAT: case COMBAT:
combatCount++; combatCount++;
roomName = room.getBoss().getName(); roomName = room.getBoss().getName();
switch (RaidRoom.Boss.fromString(roomName)) switch (Objects.requireNonNull(RaidRoom.Boss.fromString(roomName)))
{ {
case VANGUARDS: case VANGUARDS:
vanguards = true; vanguards = true;
@@ -189,7 +190,7 @@ public class RaidsOverlay extends Overlay
break; break;
case PUZZLE: case PUZZLE:
roomName = room.getPuzzle().getName(); roomName = room.getPuzzle().getName();
switch (RaidRoom.Puzzle.fromString(roomName)) switch (Objects.requireNonNull(RaidRoom.Puzzle.fromString(roomName)))
{ {
case CRABS: case CRABS:
crabs = true; crabs = true;