diff options
6 files changed, 12 insertions, 6 deletions
diff --git a/options.txt b/options.txt index 0cbb760b..f359abbb 100755 --- a/options.txt +++ b/options.txt @@ -24,7 +24,7 @@ chatLinks:true chatLinksPrompt:true chatOpacity:1.0 snooperEnabled:true -fullscreen:false +fullscreen:true enableVsync:false useVbo:true hideServerAddress:false @@ -101,6 +101,7 @@ key_start editing session:19 key_send and save bombdefuse solution:35 key_navigate to next secret. (Req option enabled at /dg):34 key_toggle Pathfind. (Req option enabled at /dg):47 +key_Toggle freeze pathfind lines:49 key_Open Maddox Menu:50 key_Regular Ability:75 key_Start/Stop Skill Tracker:76 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; |