Skip to content

Commit b5db8fb

Browse files
committed
fixed weird merge conflict
1 parent e0367bb commit b5db8fb

File tree

1 file changed

+0
-5
lines changed

1 file changed

+0
-5
lines changed

fabric/src/main/java/cc/tweaked_programs/cccbridge/common/minecraft/block/RedRouterBlock.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,6 @@ public int getSignal(@NotNull BlockState state, @NotNull BlockGetter level, @Not
7878
return getDirectSignal(state, level, pos, direction);
7979
}
8080

81-
@Override
82-
public int getDirectSignal(BlockState state, BlockGetter level, BlockPos pos, Direction direction) {
83-
return getSignal(state, level, pos, direction);
84-
}
85-
8681
@Override
8782
public InteractionResult onWrenched(BlockState state, UseOnContext context) {
8883
BlockEntity tileentity = context.getLevel().getBlockEntity(context.getClickedPos());

0 commit comments

Comments
 (0)