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.

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 entity movement in custom fluid types #1922

Conversation

sciwhiz12
Copy link
Member

This PR fixes #1832 by patching LivingEntity#travel to handle custom fluid types, reimplementing a missing patch from 1.21.1 as described in the description of the linked issue.

Tested through the tests client by diving into a pool filled with new_fluid_test:test_fluid (the creative search tab should yield a bucket for it) and trying to swim upwards. Before the fix, the player falls through it as if it wasn't there, but could not jump. After the fix, the player moves in the fluid like if it were water or lava, and can jump.

@sciwhiz12 sciwhiz12 added bug A bug or error regression Worked previously but doesn't anymore 1.21.4 Targeted at Minecraft 1.21.4 labels Jan 27, 2025
@neoforged-pr-publishing
Copy link

neoforged-pr-publishing bot commented Jan 27, 2025

  • Publish PR to GitHub Packages

Last commit published: 2dc17cb2b660267bf51d789ebb575c4a31bd4983.

PR Publishing

The artifacts published by this PR:

Repository Declaration

In order to use the artifacts published by the PR, add the following repository to your buildscript:

repositories {
    maven {
        name 'Maven for PR #1922' // https://github.com/neoforged/NeoForge/pull/1922
        url 'https://prmaven.neoforged.net/NeoForge/pr1922'
        content {
            includeModule('net.neoforged', 'neoforge')
            includeModule('net.neoforged', 'testframework')
        }
    }
}

MDK installation

In order to setup a MDK using the latest PR version, run the following commands in a terminal.
The script works on both *nix and Windows as long as you have the JDK bin folder on the path.
The script will clone the MDK in a folder named NeoForge-pr1922.
On Powershell you will need to remove the -L flag from the curl invocation.

mkdir NeoForge-pr1922
cd NeoForge-pr1922
curl -L https://prmaven.neoforged.net/NeoForge/pr1922/net/neoforged/neoforge/21.4.78-beta-pr-1922-fix-1.21.4-GH-1832-custom-fluid-type-movement/mdk-pr1922.zip -o mdk.zip
jar xf mdk.zip
rm mdk.zip || del mdk.zip

To test a production environment, you can download the installer from here.

@sciwhiz12

This comment was marked as resolved.

@neoforged-automation

This comment was marked as resolved.

@neoforged-automation

This comment was marked as resolved.

@Matyrobbrt
Copy link
Member

@neoforged/bots backport 1.21.3

@neoforged-automation
Copy link

Backporting to 1.21.3...

@neoforged-automation
Copy link

@Matyrobbrt backport to 1.21.3 failed.

Click for failure reason

Command './gradlew unpackSourcePatches' failed execution with error:
FAILURE: Build failed with an exception.

  • What went wrong:
    Task 'unpackSourcePatches' not found in root project 'PRActionRunner' and its subprojects.

  • Try:

Run gradlew tasks to get a list of available tasks.
For more on name expansion, please refer to https://docs.gradle.org/8.10.1/userguide/command_line_interface.html#sec:name_abbreviation in the Gradle documentation.
Run with --stacktrace option to get the stack trace.
Run with --info or --debug option to get more log output.
Run with --scan to get full insights.
Get more help at https://help.gradle.org.

BUILD FAILED in 1s

https://github.com/neoforged/PRActionRunner/actions/runs/12999959383

@Matyrobbrt

This comment has been minimized.

@neoforged-automation
Copy link

Created backport PR: #1925

@sciwhiz12 sciwhiz12 merged commit a1831ff into neoforged:1.21.x Jan 28, 2025
7 checks passed
@sciwhiz12 sciwhiz12 deleted the fix/1.21.4/GH-1832-custom-fluid-type-movement branch January 28, 2025 07:05
@neoforged-releases
Copy link

🚀 This PR has been released as NeoForge version 21.4.77-beta.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
1.21.4 Targeted at Minecraft 1.21.4 bug A bug or error regression Worked previously but doesn't anymore
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[1.21.4] Regression in the effects of modded fluids on entity movement.
4 participants