Skip to content

Commit 732731e

Browse files
committed
Smol fixes
1 parent ae84389 commit 732731e

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

src/main/kotlin/HighwayTools.kt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,7 @@ internal object HighwayTools : PluginModule(
302302
startingDirection = Direction.fromEntity(player)
303303
primedPos = BlockPos.NULL_VECTOR
304304
prePrimedPos = BlockPos.NULL_VECTOR
305+
grindCycles = 0
305306

306307
baritoneSettingAllowPlace = BaritoneUtils.settings?.allowPlace?.value ?: true
307308
baritoneSettingAllowBreak = BaritoneUtils.settings?.allowBreak?.value ?: true
@@ -1981,7 +1982,7 @@ internal object HighwayTools : PluginModule(
19811982
it.block is BlockLiquid && it.getValue(BlockLiquid.LEVEL) != 0
19821983
}
19831984

1984-
val filler = if (isInsideBlueprintBuild(neighbourPos)) material else fillerMat
1985+
val filler = if (isInsideBlueprintBuild(neighbourPos) && mode == Mode.HIGHWAY) material else fillerMat
19851986

19861987
pendingTasks[neighbourPos]?.let {
19871988
if (isFlowing) {
@@ -2004,8 +2005,13 @@ internal object HighwayTools : PluginModule(
20042005
}
20052006

20062007
private fun SafeClientEvent.updateLiquidTask(blockTask: BlockTask) {
2007-
val filler = if (player.inventorySlots.countBlock(fillerMat) == 0 || isInsideBlueprintBuild(blockTask.blockPos)) material
2008-
else fillerMat
2008+
val filler = if (player.inventorySlots.countBlock(fillerMat) == 0 ||
2009+
(isInsideBlueprintBuild(blockTask.blockPos) &&
2010+
mode == Mode.HIGHWAY)) {
2011+
material
2012+
} else {
2013+
fillerMat
2014+
}
20092015

20102016
if (world.getBlockState(blockTask.blockPos).getValue(BlockLiquid.LEVEL) != 0) {
20112017
blockTask.updateState(TaskState.LIQUID_FLOW)

0 commit comments

Comments
 (0)