aboutsummaryrefslogtreecommitdiff
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java3
-rwxr-xr-xmod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorTeleportMazeSolver.java5
2 files changed, 6 insertions, 2 deletions
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java
index 809f7272..236dcb40 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomfinder/DungeonRoom.java
@@ -98,7 +98,8 @@ public class DungeonRoom {
}
public void setCurrentState(RoomState currentState) {
- context.getRecorder().createEvent(new DungeonStateChangeEvent(unitPoints.iterator().next(), dungeonRoomInfo.getName(), this.currentState, currentState));
+ context.getRecorder().createEvent(new DungeonStateChangeEvent(unitPoints.iterator().next(),
+ dungeonRoomInfo == null ? null : dungeonRoomInfo.getName(), this.currentState, currentState));
this.currentState = currentState;
}
diff --git a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorTeleportMazeSolver.java b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorTeleportMazeSolver.java
index 927ed1de..b569380f 100755
--- a/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorTeleportMazeSolver.java
+++ b/mod/src/main/java/kr/syeyoung/dungeonsguide/mod/dungeon/roomprocessor/RoomProcessorTeleportMazeSolver.java
@@ -87,7 +87,10 @@ public class RoomProcessorTeleportMazeSolver extends GeneralRoomProcessor {
if (b == Blocks.stone_slab || b == Blocks.stone_slab2) {
boolean teleport = false;
- if (lastPlayerLocation != null && lastPlayerLocation.distanceSq(pos2) < 3) {
+ if (lastPlayerLocation == null) {
+ return;
+ }
+ if (lastPlayerLocation.distanceSq(pos2) < 3) {
return;
}
for (BlockPos allInBox : BlockPos.getAllInBox(lastPlayerLocation, pos2)) {