From ff817d0a37b907ff1f5132b04e737413b020ecd1 Mon Sep 17 00:00:00 2001
From: syeyoung <42869671+cyoung06@users.noreply.github.com>
Date: Mon, 14 Dec 2020 22:13:59 +0900
Subject: null null

---
 .../kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java     | 4 ++--
 .../syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java  | 4 ++--
 .../dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java         | 4 ++--
 src/main/resources/roomdata/datas.txt                                 | 3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java
index 79752eab..9965e11d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java
@@ -18,7 +18,7 @@ import java.util.*;
 public class DungeonLever implements DungeonMechanic {
     private OffsetPoint leverPoint = new OffsetPoint(0,0,0);
     private List<String> preRequisite = new ArrayList<String>();
-    private String triggering;
+    private String triggering = "";
 
     @Override
     public Set<Action> getAction(String state, DungeonRoom dungeonRoom) {
@@ -63,7 +63,7 @@ public class DungeonLever implements DungeonMechanic {
 
     @Override
     public String getCurrentState(DungeonRoom dungeonRoom) {
-
+        if (triggering == null) triggering = "null";
         DungeonMechanic mechanic = dungeonRoom.getDungeonRoomInfo().getMechanics().get(triggering);
         if (mechanic == null)
         {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java
index 10a6ecab..87e2b44d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java
@@ -15,7 +15,7 @@ import java.util.List;
 public class DungeonOnewayLever implements DungeonMechanic {
     private OffsetPoint leverPoint = new OffsetPoint(0,0,0);
     private List<String> preRequisite = new ArrayList<String>();
-    private String triggering;
+    private String triggering = "";
 
     @Override
     public Set<Action> getAction(String state, DungeonRoom dungeonRoom) {
@@ -60,7 +60,7 @@ public class DungeonOnewayLever implements DungeonMechanic {
 
     @Override
     public String getCurrentState(DungeonRoom dungeonRoom) {
-
+        if (triggering == null) triggering = "null";
         DungeonMechanic mechanic = dungeonRoom.getDungeonRoomInfo().getMechanics().get(triggering);
         if (mechanic == null)
         {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java
index a59b44b5..d36c8cd2 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java
@@ -15,7 +15,7 @@ import java.util.List;
 public class DungeonPressurePlate implements DungeonMechanic {
     private OffsetPoint platePoint = new OffsetPoint(0,0,0);
     private List<String> preRequisite = new ArrayList<String>();
-    private String triggering;
+    private String triggering = "";
 
     @Override
     public Set<Action> getAction(String state, DungeonRoom dungeonRoom) {
@@ -62,7 +62,7 @@ public class DungeonPressurePlate implements DungeonMechanic {
 
     @Override
     public String getCurrentState(DungeonRoom dungeonRoom) {
-
+        if (triggering == null) triggering = "null";
         DungeonMechanic mechanic = dungeonRoom.getDungeonRoomInfo().getMechanics().get(triggering);
         if (mechanic == null)
         {
diff --git a/src/main/resources/roomdata/datas.txt b/src/main/resources/roomdata/datas.txt
index 6880da63..ef7498c2 100644
--- a/src/main/resources/roomdata/datas.txt
+++ b/src/main/resources/roomdata/datas.txt
@@ -8,4 +8,5 @@ roomdata/cf6d49d3-4f1e-4ec9-836e-049573793ddd.roomdata
 roomdata/cf44c95c-950e-49e0-aa4c-82c2b18d0acc.roomdata
 roomdata/d3e61abf-4198-4520-a950-a03761a0eb6f.roomdata
 roomdata/ffd5411b-6ff4-4f60-b387-72f00510ec50.roomdata
-roomdata/b2dce4ed-2bda-4303-a4d7-3ebb914db318.roomdata
\ No newline at end of file
+roomdata/b2dce4ed-2bda-4303-a4d7-3ebb914db318.roomdata
+roomdata/d8f40437-348d-401d-95d4-cbae79297d97.roomdata
\ No newline at end of file
-- 
cgit