Skip to content

Commit 97b1cb1

Browse files
committed
Prevent pathing on results
1 parent b97f0b1 commit 97b1cb1

File tree

4 files changed

+9
-6
lines changed

4 files changed

+9
-6
lines changed

common/src/main/kotlin/com/lambda/interaction/construction/result/BreakResult.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ sealed class BreakResult : BuildResult() {
117117
data class PlayerOnTop(
118118
override val blockPos: BlockPos,
119119
val blockState: BlockState
120-
) : Resolvable, BreakResult() {
120+
) : Navigable, Resolvable, BreakResult() {
121121
override val rank = Rank.BREAK_PLAYER_ON_TOP
122122

123123
override val resolve get() =

common/src/main/kotlin/com/lambda/interaction/construction/result/BuildResult.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ abstract class BuildResult : ComparableResult<Rank> {
4545
*/
4646
data class ChunkNotLoaded(
4747
override val blockPos: BlockPos
48-
) : Resolvable, BuildResult() {
48+
) : Navigable, Resolvable, BuildResult() {
4949
override val rank = Rank.CHUNK_NOT_LOADED
5050

5151
override val resolve get() = moveUntilLoaded(blockPos)
@@ -112,7 +112,7 @@ abstract class BuildResult : ComparableResult<Rank> {
112112
val hitPos: BlockPos,
113113
val side: Direction,
114114
val distance: Double
115-
) : Resolvable, BuildResult() {
115+
) : Navigable, Resolvable, BuildResult() {
116116
override val rank = Rank.NOT_VISIBLE
117117

118118
override val resolve get() = moveToGoal(GoalPlace(blockPos))
@@ -184,7 +184,7 @@ abstract class BuildResult : ComparableResult<Rank> {
184184
val hitVec: Vec3d,
185185
val reach: Double,
186186
val side: Direction,
187-
) : Resolvable, BuildResult() {
187+
) : Navigable, Resolvable, BuildResult() {
188188
override val rank = Rank.OUT_OF_REACH
189189

190190
val distance: Double by lazy {
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
package com.lambda.interaction.construction.result
2+
3+
interface Navigable

common/src/main/kotlin/com/lambda/interaction/construction/result/PlaceResult.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ sealed class PlaceResult : BuildResult() {
5959

6060
data class BlockedByPlayer(
6161
override val blockPos: BlockPos
62-
) : Resolvable, PlaceResult() {
62+
) : Navigable, Resolvable, PlaceResult() {
6363
override val rank = Rank.PLACE_BLOCKED_BY_PLAYER
6464

6565
override val resolve get() = moveToGoalUntil(GoalInverted(GoalBlock(blockPos))) {
@@ -74,7 +74,7 @@ sealed class PlaceResult : BuildResult() {
7474
data class CantReplace(
7575
override val blockPos: BlockPos,
7676
val simulated: ItemPlacementContext
77-
) : Resolvable, PlaceResult() {
77+
) : Navigable, Resolvable, PlaceResult() {
7878
override val rank = Rank.PLACE_CANT_REPLACE
7979

8080
// override val resolve = breakBlock(simulated.blockPos)

0 commit comments

Comments
 (0)