-
-
Notifications
You must be signed in to change notification settings - Fork 138
optimize-movement-vector-normalization #610
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.
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
VeVeVeVel
wants to merge
3
commits into
Winds-Studio:ver/1.21.11
Choose a base branch
from
VeVeVeVel:optimize-movement-vector-normalization
base: ver/1.21.11
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
29 changes: 29 additions & 0 deletions
29
leaf-server/minecraft-patches/features/0294-optimize-movement-vector-normalization.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: VeVeVeVel <147647046+VeVeVeVel@users.noreply.github.com> | ||
| Date: Mon, 26 Jan 2026 22:24:02 +0900 | ||
| Subject: [PATCH] optimize movement vector normalization | ||
|
|
||
|
|
||
| diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java | ||
| index 8d092716cdcc48b829a1c0ee2e5416d648143a37..310fcb589f515b223d2b263ee99f734cd876f926 100644 | ||
| --- a/net/minecraft/world/entity/Entity.java | ||
| +++ b/net/minecraft/world/entity/Entity.java | ||
| @@ -1262,8 +1262,16 @@ public abstract class Entity implements SyncedDataHolder, DebugValueSource, Name | ||
| double d = vec3.lengthSqr(); | ||
| if (d > 1.0E-7 || movement.lengthSqr() - d < 1.0E-7) { | ||
| if (this.fallDistance != 0.0 && d >= 1.0) { | ||
| - double min = Math.min(vec3.length(), 8.0); | ||
| - Vec3 vec31 = this.position().add(vec3.normalize().scale(min)); | ||
| + // Leaf start - optimize movement vector normalization | ||
| + //double min = Math.min(vec3.length(), 8.0); | ||
| + //Vec3 vec31 = this.position().add(vec3.normalize().scale(min)); | ||
| + Vec3 vec31; | ||
| + if (d > 64.0) { | ||
| + vec31 = this.position().add(vec3.normalize().scale(8.0)); | ||
| + } else { | ||
| + vec31 = this.position().add(vec3); | ||
| + } | ||
| + // Leaf end - optimize movement vector normalization | ||
| BlockHitResult blockHitResult = this.level() | ||
| .clip(new ClipContext(this.position(), vec31, ClipContext.Block.FALLDAMAGE_RESETTING, ClipContext.Fluid.WATER, this)); | ||
| if (blockHitResult.getType() != HitResult.Type.MISS) { | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The concept looks great. However It's better to directly replace the original code instead of commenting them, the patch already helps keep the original code part.
And I think we can inline
vec3'snormalize()andscale(8.0)call below, to avoid unnecessary new Vec3 instance creation and useless calls.Make sure also open a pull request to upload a benchmark to SunBox, since it's the math-related micro optimization.