Skip to content

getRoomYOffsetFromPos() now affects swimming and crouching. #19

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
Matlauk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

getRoomYOffsetFromPos() now affects swimming and crouching. #19

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
20 changes: 14 additions & 6 deletions patches/net/minecraft/client/entity/player/ClientPlayerEntity.java.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@

if (this.onGround && this.abilities.isFlying && !this.mc.playerController.isSpectatorMode())
{
@@ -1008,12 +1205,58 @@
@@ -1008,12 +1205,66 @@
return super.removeActivePotionEffect(potioneffectin);
}

Expand Down Expand Up @@ -425,14 +425,22 @@
+
+ public double getRoomYOffsetFromPos() {
+ double oy = 0;
+ //Adjust room origin to account for pose.
+ if(this.getPose() == Pose.FALL_FLYING || this.getPose() == Pose.SPIN_ATTACK)
+ oy = 1.62 - 0.4;
+ //Adjust room origin to account for pose.
+ if(this.getPose() == Pose.FALL_FLYING ||
+ this.getPose() == Pose.SPIN_ATTACK ||
+ this.getPose() == Pose.SWIMMING)
+ oy = 1.62 - 0.4;
+ else if (this.getPose() == Pose.CROUCHING &&
+ !mc.vrSettings.realisticSneakEnabled)
+ {
+ oy = 1.62 - 1.27;
+ }
+
+ return -oy;
}

public boolean isAutoJumpEnabled()
@@ -1031,13 +1274,17 @@
@@ -1031,13 +1282,17 @@
float f = this.getAIMoveSpeed();
float f1 = (float)vec3d2.lengthSquared();

Expand All @@ -452,7 +460,7 @@
vec3d2 = new Vec3d((double)(f2 * f5 - f3 * f4), vec3d2.y, (double)(f3 * f5 + f2 * f4));
f1 = (float)vec3d2.lengthSquared();

@@ -1220,4 +1467,406 @@
@@ -1220,4 +1475,406 @@
return this.eyesInWaterPlayer;
}
}
Expand Down