massive refactor

2 files changed, 3 insertions, 3 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionChangeState.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionChangeState.java
index 82e87425..9a883cb8 100755
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionChangeState.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/ActionChangeState.java
@@ -28,7 +28,7 @@ public class ActionChangeState extends AbstractAction{
     public Set<Action> getPreRequisites(DungeonRoom dungeonRoom) {
         Set<Action> set = new HashSet<Action>();
         set.addAll(preRequisite2);
-        DungeonMechanic mechanic = dungeonRoom.getDungeonRoomInfo().getMechanics().get(mechanicName);
+        DungeonMechanic mechanic = dungeonRoom.getMechanics().get(mechanicName);
         if (mechanic!= null)
             set.addAll(mechanic.getAction(state, dungeonRoom));
         return set;
@@ -40,7 +40,7 @@ public class ActionChangeState extends AbstractAction{
 
     @Override
     public boolean isComplete(DungeonRoom dungeonRoom) {
-        DungeonMechanic mechanic = dungeonRoom.getDungeonRoomInfo().getMechanics().get(mechanicName);
+        DungeonMechanic mechanic = dungeonRoom.getMechanics().get(mechanicName);
         if (state.equalsIgnoreCase("navigate"))
             return true;
         if (mechanic== null)
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java
index 49026db9..d5c99c8a 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/dungeon/actions/tree/ActionRoute.java
@@ -71,7 +71,7 @@ public class ActionRoute {
 
         current.onTick(dungeonRoom);
 
-        if (dungeonRoom.getDungeonRoomInfo().getMechanics().get(mechanic).getCurrentState(dungeonRoom).equals(state)) {
+        if (dungeonRoom.getMechanics().get(mechanic).getCurrentState(dungeonRoom).equals(state)) {
             this.current = actions.size() - 1;
         }