From 94f3b078639615a195ce865223d029ecaa12d4b2 Mon Sep 17 00:00:00 2001 From: yeahimman Date: Fri, 5 Dec 2025 14:44:59 +0100 Subject: [PATCH 1/2] checks if ROOM_REGISTRAR is null before using it --- .../java/dev/compactmods/machines/api/CompactMachines.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java b/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java index d4092c14..0e10804c 100644 --- a/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java +++ b/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java @@ -136,6 +136,9 @@ public static IPlayerHistoryApi playerHistoryApi() { } public static Optional room(String roomCode) { + if (ROOM_REGISTRAR == null) { + return Optional.empty(); + } return ROOM_REGISTRAR.get(roomCode); } @@ -161,8 +164,8 @@ public static RoomInstance newRoom(MinecraftServer server, RoomTemplate template final var spawnManager = SPAWN_MANAGERS.get(instance.code()); template.optionalFloor().ifPresent(floorState -> { var fixedSpawn = instance.boundaries() - .defaultSpawn() - .add(0, 1, 0); + .defaultSpawn() + .add(0, 1, 0); spawnManager.setDefaultSpawn(fixedSpawn, Vec2.ZERO); From 758bf127186723364c4ea5bd8a02f43bfb578417 Mon Sep 17 00:00:00 2001 From: yeahimman Date: Fri, 5 Dec 2025 15:38:44 +0100 Subject: [PATCH 2/2] remove accidental indentation --- .../java/dev/compactmods/machines/api/CompactMachines.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java b/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java index 0e10804c..47cd1384 100644 --- a/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java +++ b/core-api/src/main/java/dev/compactmods/machines/api/CompactMachines.java @@ -164,8 +164,8 @@ public static RoomInstance newRoom(MinecraftServer server, RoomTemplate template final var spawnManager = SPAWN_MANAGERS.get(instance.code()); template.optionalFloor().ifPresent(floorState -> { var fixedSpawn = instance.boundaries() - .defaultSpawn() - .add(0, 1, 0); + .defaultSpawn() + .add(0, 1, 0); spawnManager.setDefaultSpawn(fixedSpawn, Vec2.ZERO);