aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsyeyoung <42869671+cyoung06@users.noreply.github.com>2020-11-30 11:48:44 +0900
committersyeyoung <42869671+cyoung06@users.noreply.github.com>2020-11-30 11:48:44 +0900
commit18805985c19486a507024f444c0091a77cdfa35a (patch)
tree3bf4dd61fc576b0397f6403397ec313e0d3ccc77
parent22eb23e43c859efae759a92b953384983fca507a (diff)
downloadSkyblock-Dungeons-Guide-18805985c19486a507024f444c0091a77cdfa35a.tar.gz
Skyblock-Dungeons-Guide-18805985c19486a507024f444c0091a77cdfa35a.tar.bz2
Skyblock-Dungeons-Guide-18805985c19486a507024f444c0091a77cdfa35a.zip
WATER
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java1
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/WaterBoard.java2
-rw-r--r--src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/nodes/WaterNodeStart.java1
3 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java
index a64525a8..99280053 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/RoomProcessorWaterPuzzle.java
@@ -90,6 +90,7 @@ public class RoomProcessorWaterPuzzle extends GeneralRoomProcessor {
BlockPos target = waterBoard.getTarget();
if (target != null) {
RenderUtils.highlightBlock(target, new Color(0,255,255,255), partialTicks);
+ RenderUtils.highlightBlock(waterBoard.getToggleableMap().get("mainStream").getBlockPos(), new Color(0,255,0,255), partialTicks);
}
// RenderUtils.highlightBlock(waterBoard.get);
}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/WaterBoard.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/WaterBoard.java
index 56564070..8f0b3ee5 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/WaterBoard.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/WaterBoard.java
@@ -262,7 +262,7 @@ public class WaterBoard {
int data= pos.getData(waterPuzzle.getDungeonRoom());
node = new WaterNodeEnd(id+":"+data, front.getBlockPos(waterPuzzle.getDungeonRoom()),x,y);
waterNodeEndMap.put(id+":"+data, (WaterNodeEnd) node);
- } else if (y == 2) {
+ } else if (y == 2 && x == 9) {
waterNodeStart = (WaterNodeStart) (node = new WaterNodeStart(front.getBlockPos(waterPuzzle.getDungeonRoom()),
frontId != 0 ^ isSwitchActive(validSwitches.get("mainStream")),x,y));
} else {
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/nodes/WaterNodeStart.java b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/nodes/WaterNodeStart.java
index c8197919..a25299c2 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/nodes/WaterNodeStart.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/roomprocessor/waterpuzzle/nodes/WaterNodeStart.java
@@ -33,7 +33,6 @@ public class WaterNodeStart implements WaterNode {
}
public boolean isTriggered(World w) {
- System.out.println("water filled called");
return isWaterFilled(w);
}