AstralTransRocketries/Squake
1
0
Fork 0
mirror of https://github.com/squeek502/Squake.git synced 2025-09-18 16:35:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix sharking height

Browse Source
This commit is contained in:
CoolMineman 2021-02-20 14:16:19 -06:00
parent 75b1a5223a
commit c02085675a
No known key found for this signature in database
GPG Key ID: AD76E368E7380CE5
1 changed files with 18 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
java/squeek/quakemovement/QuakeClientPlayer.java
View File

@ -10,17 +10,19 @@ import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.fluid.FluidState; import net.minecraft.fluid.FluidState;
import net.minecraft.particle.BlockStateParticleEffect; import net.minecraft.particle.BlockStateParticleEffect;
import net.minecraft.particle.ParticleTypes; import net.minecraft.particle.ParticleTypes;
import net.minecraft.tag.FluidTags;
import net.minecraft.util.math.BlockPos; import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Box; import net.minecraft.util.math.Box;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.Vec3d; import net.minecraft.util.math.Vec3d;
import net.minecraft.util.shape.VoxelShape;
import net.minecraft.world.World; import net.minecraft.world.World;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Random; import java.util.Random;
import org.apache.commons.lang3.mutable.MutableBoolean;
public class QuakeClientPlayer public class QuakeClientPlayer
{ {
private QuakeClientPlayer(){} private QuakeClientPlayer(){}
@ -226,30 +228,23 @@ public class QuakeClientPlayer
} }
private static boolean isInWater(Box box, World world) { private static boolean isInWater(Box box, World world) {
int i = MathHelper.floor(box.minX); return BlockPos.stream(box).anyMatch(pos -> {
int j = MathHelper.ceil(box.maxX); FluidState fluidState = world.getFluidState(pos);
int k = MathHelper.floor(box.minY); return intersects(fluidState.getShape(world, pos), box);
int l = MathHelper.ceil(box.maxY); });
int m = MathHelper.floor(box.minZ);
int n = MathHelper.ceil(box.maxZ);
if (!world.isRegionLoaded(i, k, m, j, l, n)) {
return false;
}
BlockPos.Mutable mutable = new BlockPos.Mutable();
for(int p = i; p < j; ++p) {
for(int q = k; q < l; ++q) {
for(int r = m; r < n; ++r) {
mutable.set(p, q, r);
FluidState fluidState = world.getFluidState(mutable);
if (fluidState.isIn(FluidTags.WATER)) {
return true;
}
}
}
}
return false;
} }
public static boolean intersects(VoxelShape shape, Box box) {
if (shape.isEmpty()) return false;
MutableBoolean result = new MutableBoolean(false);
shape.forEachBox((minX, minY, minZ, maxX, maxY, maxZ) -> {
if (box.intersects(minX, minY, minZ, maxX, maxY, maxZ)) {
result.setTrue();
}
});
return result.booleanValue();
}
/* ================================================= /* =================================================
* END HELPERS * END HELPERS
* ================================================= * =================================================