Skip to content
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

fix ItemEntity affected by Create's AirCurrent cannot be pick by Create Funnels, Fix #867, #688 #955

Merged
merged 1 commit into from
Sep 23, 2024
+5 −0
Merged

fix ItemEntity affected by Create's AirCurrent cannot be pick by Create Funnels, Fix #867, #688 #955

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
5 changes: 5 additions & 0 deletions common/src/main/java/org/valkyrienskies/mod/mixin/feature/entity_collision/MixinEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ private void redirectSetVelocity(final MoverType moverType, final Vec3 movement,
- collisionResponseHorizontalNormal.z() * parallelHorizontalVelocityComponent
);
}
// The rest of the move function (including tryCheckInsideBlocks) is skipped, so calling it here
tryCheckInsideBlocks();
// Cancel the original invocation of Entity.setVelocity(DDD)V to remove vanilla behavior
callbackInfo.cancel();
}
Expand Down Expand Up @@ -224,6 +226,9 @@ private void preSpawnSprintParticle(final CallbackInfo ci) {
@Shadow
public abstract void setDeltaMovement(double x, double y, double z);

@Shadow
protected abstract void tryCheckInsideBlocks();

@Shadow
protected abstract Vec3 collide(Vec3 vec3d);

Expand Down
Loading