[1.20.4] Make player feet and eyes both need to be in swimmable fluid…

… to swim (#379) Fixes #220
neoforged · Dec 16, 2023 · f2ecd67 · f2ecd67
1 parent 95a7e6c
commit f2ecd67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/patches/net/minecraft/world/entity/Entity.java.patch b/patches/net/minecraft/world/entity/Entity.java.patch
@@ -510,7 +510,7 @@
 
 +    /**
 +     * Gets the value of the legacy {@link #maxUpStep} field. Only used by players when the modified value causes issues.
-+     * @deprecated Use {@link IEntityExtension#getStepHeight()} to get the real step height value.
++     * @deprecated Use {@link net.neoforged.neoforge.common.extensions.IEntityExtension#getStepHeight()} to get the real step height value.
 +     */
 +    @Deprecated
      public float maxUpStep() {

diff --git a/src/main/java/net/neoforged/neoforge/common/extensions/IEntityExtension.java b/src/main/java/net/neoforged/neoforge/common/extensions/IEntityExtension.java
@@ -298,7 +298,7 @@ default boolean isEyeInFluidType(FluidType type) {
      * @return {@code true} if the entity can start swimming, {@code false} otherwise
      */
     default boolean canStartSwimming() {
-        return !this.getEyeInFluidType().isAir() && this.canSwimInFluidType(this.getEyeInFluidType());
+        return !this.getEyeInFluidType().isAir() && this.canSwimInFluidType(this.getEyeInFluidType()) && this.canSwimInFluidType(this.self().level().getFluidState(this.self().blockPosition()).getFluidType());
     }
 
     /**