aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java2
-rwxr-xr-xsrc/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEvent.java4
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventData.java4
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventHolder.java3
5 files changed, 10 insertions, 5 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java
index e64751b1..9f97adbb 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMove.java
@@ -76,7 +76,7 @@ public class ActionMove extends AbstractAction {
try {
if (latestFuture != null) latestFuture.cancel(true);
} catch (Exception ignored) {}
- if (!FeatureRegistry.SECRET_FREEZE_LINES.isEnabled())
+ if (!FeatureRegistry.SECRET_FREEZE_LINES.isEnabled() || poses == null)
latestFuture = dungeonRoom.createEntityPathTo(dungeonRoom.getContext().getWorld(),
Minecraft.getMinecraft().thePlayer, target.getBlockPos(dungeonRoom), Integer.MAX_VALUE);
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java
index ef4e9062..3c2131ee 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionMoveNearestAir.java
@@ -74,7 +74,7 @@ public class ActionMoveNearestAir extends AbstractAction {
try {
if (latestFuture != null) latestFuture.cancel(true);
} catch (Exception ignored) {}
- if (!FeatureRegistry.SECRET_FREEZE_LINES.isEnabled())
+ if (!FeatureRegistry.SECRET_FREEZE_LINES.isEnabled()|| poses == null)
latestFuture = dungeonRoom.createEntityPathTo(dungeonRoom.getContext().getWorld(),
Minecraft.getMinecraft().thePlayer, target.getBlockPos(dungeonRoom), Integer.MAX_VALUE);
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEvent.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEvent.java
index cb2b3f57..e73a9119 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEvent.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEvent.java
@@ -3,8 +3,10 @@ package kr.syeyoung.dungeonsguide.dungeon.events;
import kr.syeyoung.dungeonsguide.features.FeatureRegistry;
import lombok.Data;
+import java.io.Serializable;
+
@Data
-public class DungeonEvent {
+public class DungeonEvent implements Serializable {
private long UTCTime = System.currentTimeMillis();
private long realTimeElapsed;
private long skyblockTimeElapsed;
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventData.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventData.java
index 2aa5ff68..46c2c7b0 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventData.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventData.java
@@ -1,5 +1,7 @@
package kr.syeyoung.dungeonsguide.dungeon.events;
-public interface DungeonEventData {
+import java.io.Serializable;
+
+public interface DungeonEventData extends Serializable {
String getEventName();
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventHolder.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventHolder.java
index de1752a7..d30f7350 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventHolder.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/events/DungeonEventHolder.java
@@ -2,11 +2,12 @@ package kr.syeyoung.dungeonsguide.dungeon.events;
import lombok.Data;
+import java.io.Serializable;
import java.util.List;
import java.util.Set;
@Data
-public class DungeonEventHolder {
+public class DungeonEventHolder implements Serializable {
private long date;
private Set<String> players;
private List<DungeonEvent> eventDataList;