Skip to content

Commit

Permalink
fix tanks not getting filled with buckets bug from merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
Lothrazar committed Apr 13, 2024
1 parent a652db7 commit 2d3ad92
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ org.gradle.daemon=false

curse_id=239286

mod_version=1.7.18
mod_version=1.7.19

mc_version=1.18.2
forge_version=40.2.17
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/lothrazar/cyclic/block/BlockCyclic.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ public BlockState rotate(BlockState state, LevelAccessor world, BlockPos pos, Ro
@SuppressWarnings("deprecation")
@Override
public InteractionResult use(BlockState state, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult hit) {
if (hasFluidInteract && player.getItemInHand(hand).isEmpty()) {
if (hasFluidInteract) {
if (!world.isClientSide) {
BlockEntity tankHere = world.getBlockEntity(pos);
if (tankHere != null) {
Expand Down

0 comments on commit 2d3ad92

Please sign in to comment.