AstralTransRocketries/Squake
1
0
Fork 0
mirror of https://github.com/squeek502/Squake.git synced 2025-08-03 17:58:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix sharking

Browse Source
This commit is contained in:
CoolMineman 2020-07-31 23:05:06 -05:00
parent 1556c203e1
commit 7e3dc0f754
No known key found for this signature in database
GPG Key ID: 2439F5FE115256DD
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/squeek/quakemovement/ModConfig.java
View File

@ -28,7 +28,7 @@ public class ModConfig
public static double SHARKING_SURFACE_TENSION = SHARKING_SURFACE_TENSION_DEFAULT;
private static final String SHARKING_SURFACE_TENSION_NAME = "sharkingSurfaceTension";
private static final double SHARKING_WATER_FRICTION_DEFAULT = 0.1D;
private static final double SHARKING_WATER_FRICTION_DEFAULT = 0.99D;
public static double SHARKING_WATER_FRICTION = SHARKING_WATER_FRICTION_DEFAULT;
private static final String SHARKING_WATER_FRICTION_NAME = "sharkingWaterFriction";

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

@ -336,16 +336,16 @@ public class QuakeClientPlayer
private static void minecraft_WaterMove(PlayerEntity player, Vec3d movementInput)
{
// double d0 = player.y;
// player.updateVelocity(0.04F, movementInput);
// player.move(MovementType.SELF, player.getVelocity());
// Vec3d velocity = player.getVelocity().multiply(0.800000011920929D).add(0, 0.02D, 0);
// player.setVelocity(velocity);
//
// if (player.horizontalCollision && player.method_5654(velocity.x, velocity.y + 0.6000000238418579D - player.y + d0, velocity.z))
// {
// player.setVelocity(velocity.x, 0.30000001192092896D, velocity.z);
// }
double d0 = player.getY();
player.updateVelocity(0.04F, movementInput);
player.move(MovementType.SELF, player.getVelocity());
Vec3d velocity = player.getVelocity().multiply(0.800000011920929D).add(0, 0.02D, 0);
player.setVelocity(velocity);
if (player.horizontalCollision && player.doesNotCollide(velocity.x, velocity.y + 0.6000000238418579D - player.getY() + d0, velocity.z))
{
player.setVelocity(velocity.x, 0.30000001192092896D, velocity.z);
}
}
/*
@ -411,12 +411,12 @@ public class QuakeClientPlayer
}
else if (player.isTouchingWater() && !player.abilities.flying)
{
// if (ModConfig.SHARKING_ENABLED)
// quake_WaterMove(player, (float) movementInput.x, (float) movementInput.y, (float) movementInput.z);
// else
// {
return false;
// }
if (ModConfig.SHARKING_ENABLED)
quake_WaterMove(player, (float) movementInput.x, (float) movementInput.y, (float) movementInput.z);
else
{
return false;
}
}
else
{