aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/kr/syeyoung/dungeonsguide/dungeon
diff options
context:
space:
mode:
authorsyeyoung <42869671+cyoung06@users.noreply.github.com>2020-12-14 22:13:59 +0900
committersyeyoung <42869671+cyoung06@users.noreply.github.com>2020-12-14 22:13:59 +0900
commitff817d0a37b907ff1f5132b04e737413b020ecd1 (patch)
tree85b09c45d56c40487ca179efbac93c527d0127d1 /src/main/java/kr/syeyoung/dungeonsguide/dungeon
parente8dcd5c6b2824622304ec87a701511aeefc7e361 (diff)
downloadSkyblock-Dungeons-Guide-ff817d0a37b907ff1f5132b04e737413b020ecd1.tar.gz
Skyblock-Dungeons-Guide-ff817d0a37b907ff1f5132b04e737413b020ecd1.tar.bz2
Skyblock-Dungeons-Guide-ff817d0a37b907ff1f5132b04e737413b020ecd1.zip
null null
Diffstat (limited to 'src/main/java/kr/syeyoung/dungeonsguide/dungeon')
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonLever.java4
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonOnewayLever.java4
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/dungeon/mechanics/DungeonPressurePlate.java4
3 files changed, 6 insertions, 6 deletions
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)
{