Skip to content

Commit

Permalink
fix: water walking and double jump on water
Browse files Browse the repository at this point in the history
  • Loading branch information
sekwah41 committed May 5, 2022
1 parent af21550 commit 53b341e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,16 @@ public boolean logInChat() {
return false;
}

@Override
public SoundEvent castingSound() {
return null;
}

@Override
public SoundEvent castingFailSound() {
return null;
}

@Override
public boolean handleCost(Player player, INinjaData ninjaData, int chargeAmount) {
return ninjaData.getDoubleJumpData().canDoubleJumpServer;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.sekwah.narutomod.abilities.utility;

import com.sekwah.narutomod.NarutoMod;
import com.sekwah.narutomod.abilities.Ability;
import com.sekwah.narutomod.capabilities.INinjaData;
import net.minecraft.ChatFormatting;
Expand Down Expand Up @@ -61,21 +62,33 @@ public record WaterChecks(boolean steadyCheck, boolean pushUpFast, boolean pushU

public WaterChecks checkSteadyNormalFastPush(Player player) {


int blockX = (int)Math.floor(player.getX());
int blockZ = (int)Math.floor(player.getZ());
final int block1 = (int) Math.round(player.getY() - 0.56f);
boolean steadyCheck = triggerWaterWalk(player.level, new BlockPos(blockX, block1, blockZ));

int block2 = (int) Math.round(player.getY());
int beforeBlock2 = (int) Math.round(player.yo);
boolean pushUpFast = triggerWaterWalk(player.level, new BlockPos(blockX, block2, blockZ));
if(player.level.isClientSide() && player.yo > player.getY()) {
boolean beforeYCheck = triggerWaterWalk(player.level, new BlockPos(blockX, beforeBlock2, blockZ));
if(!beforeYCheck && steadyCheck && player.yo - player.getY() < 0.9f) {
Vec3 vec = player.getDeltaMovement();
player.lerpMotion(vec.x(), 0, vec.z());
player.setPos(player.getX(), block2 + 0.05f, player.getZ());
} else {
steadyCheck = false;
}
}

int block3 = (int) Math.round(player.getY() - 0.47f);
boolean pushUpNormal = triggerWaterWalk(player.level, new BlockPos(blockX, block3, blockZ));

return new WaterChecks(steadyCheck, pushUpFast, pushUpNormal);
}

private void updatePlayerMovement(Player player) {
private void updatePlayerMovement(Player player, INinjaData ninjaData) {

// TODO rewrite as this is the old way of doing it ported over
// TODO also check if the block is waterlogged and non solid
Expand All @@ -100,6 +113,7 @@ else if (checks.pushUpNormal) {
resultingYSpeed = 0.0D;
player.resetFallDistance();
player.setOnGround(true);
ninjaData.getDoubleJumpData().canDoubleJumpServer = true;
if(player.isFallFlying()) {
player.stopFallFlying();
}
Expand All @@ -119,11 +133,11 @@ public boolean triggerWaterWalk(Level level, BlockPos blockPos) {

@Override
public void performServer(Player player, INinjaData ninjaData, int ticksActive) {
updatePlayerMovement(player);
updatePlayerMovement(player, ninjaData);
}

@Override
public void performToggleClient(Player player, INinjaData ninjaData) {
updatePlayerMovement(player);
updatePlayerMovement(player, ninjaData);
}
}

0 comments on commit 53b341e

Please sign in to comment.