Skip to content

Commit 334cd9e

Browse files
committed
non null where it makes sense
1 parent 1e1a06c commit 334cd9e

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/main/java/dev/zwazel/GameWorld.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public class GameWorld implements InternalGameWorld, PublicGameWorld {
2727

2828
private final BlockingQueue<MessageContainer> incomingMessages = new LinkedBlockingQueue<>();
2929
private final BlockingQueue<MessageContainer> outgoingMessages = new LinkedBlockingQueue<>();
30-
private DebugMode debug = DebugMode.NONE;
30+
private DebugMode debug;
3131
private boolean immediatelyStartGame;
3232
private ConnectionManager connection;
3333
private GameState gameState;
@@ -76,7 +76,7 @@ private static GameWorld getInstance() {
7676

7777
private void setup(BotInterface bot, boolean immediatelyStartGame) {
7878
this.bot = bot;
79-
this.debug = bot.getLocalBotConfig().debugMode();
79+
this.debug = bot.getLocalBotConfig().debugMode().orElse(DebugMode.NONE);
8080
this.tank = TankFactory.createTank(bot.getLocalBotConfig().tankType());
8181
this.immediatelyStartGame = immediatelyStartGame;
8282
}
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
package dev.zwazel.internal.config;
22

33
import lombok.Builder;
4+
import lombok.NonNull;
45

56
import java.util.Optional;
67

78
@Builder
8-
public record LobbyConfig(String lobbyName, String mapName, String teamName, Optional<Integer> spawnPoint,
9+
public record LobbyConfig(@NonNull String lobbyName, @NonNull String mapName, @NonNull String teamName, Optional<Integer> spawnPoint,
910
boolean fillEmptySlots) {
1011
}

src/main/java/dev/zwazel/internal/config/LocalBotConfig.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,12 @@
33
import dev.zwazel.GameWorld;
44
import dev.zwazel.internal.game.tank.Tank;
55
import lombok.Builder;
6+
import lombok.NonNull;
7+
8+
import java.util.Optional;
69

710
@Builder
8-
public record LocalBotConfig(GameWorld.DebugMode debugMode, String botName, Class<? extends Tank> tankType, String serverIp, int serverPort,
9-
LobbyConfig lobbyConfig) {
11+
public record LocalBotConfig(Optional<GameWorld.DebugMode> debugMode, @NonNull String botName,
12+
@NonNull Class<? extends Tank> tankType, @NonNull String serverIp, @NonNull int serverPort,
13+
@NonNull LobbyConfig lobbyConfig) {
1014
}

0 commit comments

Comments
 (0)