helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: correct collision axis ordering and step-up threshold to match vanilla

Browse source 
Two bugs in CollisionDetector caused persistent Y-axis bouncing (0.6 block
oscillation) while walking on flat ground:

1. GetAxisStepOrder used a complex 6-branch sorting that often placed
   horizontal axes before Y. Vanilla's Direction.Axis.axisStepOrder always
   resolves Y first, then the larger horizontal axis. Replaced with the
   simple two-case vanilla logic.

2. The horizontal-blocked checks (blockedX/blockedZ) used exact != which
   triggered on floating-point noise (~1e-15) from sin/cos in movement
   input. Vanilla uses Mth.equal (1e-5 threshold). This false positive
   caused step-up to fire every few ticks on flat terrain.

Also includes DescendTemplate robustness fixes from the previous session
(fail on unintended climbing, suppress forward input on climbable blocks).

Made-with: Cursor
This commit is contained in:
BruceChen 2026-04-11 13:22:23 +08:00
parent 4b49135107
commit 034c5d0cab
2 changed files with 15 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MinecraftClient/Pathing/Execution/Templates/DescendTemplate.cs
View file

@ -40,6 +40,10 @@ namespace MinecraftClient.Pathing.Execution.Templates
if (horizDistSq < 0.25 && Math.Abs(dy) < 0.5 && physics.OnGround)
return TemplateState.Complete;
// Fail if climbing up instead of descending
if (pos.Y > ExpectedStart.Y + 2.0)
return TemplateState.Failed;
if (_tickCount > 120)
return TemplateState.Failed;
@ -47,6 +51,9 @@ namespace MinecraftClient.Pathing.Execution.Templates
{
physics.Yaw = TemplateHelper.CalculateYaw(dx, dz);
input.Forward = true;
// Don't push into climbable blocks during descent
if (physics.OnClimbable)
input.Forward = false;
}
return TemplateState.InProgress;

33
MinecraftClient/Physics/CollisionDetector.cs
View file

@ -23,8 +23,8 @@ namespace MinecraftClient.Physics
var colliders = CollectBlockColliders(world, entityBox.ExpandTowards(movement));
Vec3d resolved = CollideWithShapes(movement, entityBox, colliders);
bool blockedX = movement.X != resolved.X;
bool blockedZ = movement.Z != resolved.Z;
bool blockedX = Math.Abs(movement.X - resolved.X) > 1.0E-5;
bool blockedZ = Math.Abs(movement.Z - resolved.Z) > 1.0E-5;
bool blockedY = movement.Y != resolved.Y;
bool hitGroundDuringMove = blockedY && movement.Y < 0.0;
@ -59,7 +59,7 @@ namespace MinecraftClient.Physics
/// <summary>
/// Collide movement against a list of shapes using axis-separated resolution.
/// Matches Entity.collideWithShapes() — processes axes in order of smallest movement first.
/// Matches Entity.collideWithShapes() with vanilla's axis ordering (Y first, then larger horizontal axis).
/// </summary>
private static Vec3d CollideWithShapes(Vec3d movement, Aabb entityBox, List<Aabb> colliders)
{
@ -82,31 +82,14 @@ namespace MinecraftClient.Physics
}
/// <summary>
/// Get axis processing order: Y first if moving down, otherwise smallest absolute movement first.
/// Vanilla uses Direction.axisStepOrder(Vec3) which returns axes sorted by absolute movement.
/// Get axis processing order matching vanilla Direction.Axis.axisStepOrder(Vec3):
/// Y is always first, then the larger horizontal axis, then the smaller.
/// </summary>
private static int[] GetAxisStepOrder(Vec3d movement)
{
double absX = Math.Abs(movement.X);
double absY = Math.Abs(movement.Y);
double absZ = Math.Abs(movement.Z);
if (absX > absZ)
{
if (absZ > absY)
return new[] { 1, 2, 0 }; // Y Z X
if (absX > absY)
return new[] { 1, 0, 2 }; // Y X Z
return new[] { 0, 1, 2 }; // X Y Z
}
else
{
if (absX > absY)
return new[] { 1, 0, 2 }; // Y X Z
if (absZ > absY)
return new[] { 1, 2, 0 }; // Y Z X
return new[] { 2, 1, 0 }; // Z Y X
}
return Math.Abs(movement.X) < Math.Abs(movement.Z)
? [1, 2, 0] // Y Z X
: [1, 0, 2]; // Y X Z
}
/// <summary>