Skip to content

Fix swamp water pulling current from non-adjacent blocks #1351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoshieGemFinder wants to merge 1 commit into
base: 1.12-fixes
Choose a base branch
from
Open

Fix swamp water pulling current from non-adjacent blocks #1351

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/main/java/thebetweenlands/common/block/terrain/BlockSwampWater.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,11 +328,7 @@ public void updateTick(World world, BlockPos pos, IBlockState state, Random rand
if (!(state.getBlock() instanceof BlockSwampWater && ((BlockSwampWater) state.getBlock()).isUnderwaterBlock)) {
// check adjacent block levels if non-source
if (quantaRemaining < quantaPerBlock) {
if (world.getBlockState(pos.add(0, -densityDir, 0)).getBlock() == this ||
world.getBlockState(pos.add(-1, -densityDir, 0)).getBlock() == this ||
world.getBlockState(pos.add(1, -densityDir, 0)).getBlock() == this ||
world.getBlockState(pos.add(0, -densityDir, -1)).getBlock() == this ||
world.getBlockState(pos.add(0, -densityDir, 1)).getBlock() == this) {
if (world.getBlockState(pos.add(0, -densityDir, 0)).getBlock() == this) {
expQuanta = quantaPerBlock - 1;
} else {
int maxQuanta = -100;
Expand Down Expand Up @@ -561,4 +557,4 @@ public FluidStack drain(World world, BlockPos pos, boolean doDrain) {
}
return super.drain(world, pos, doDrain);
}
}
}