From 3bbdbacb811023db8577c62f92cfe64f1290ddf1 Mon Sep 17 00:00:00 2001
From: LexManos <LexManos@gmail.com>
Date: Thu, 23 Apr 2026 14:36:51 -0700
Subject: [PATCH] Fix being considered in water when not. Closes #10813

---
 build.gradle                                                    | 2 +-
 .../minecraft/world/entity/EntityFluidInteraction.java.patch    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index f3ae71d953..a16064a6b9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ plugins {
     id 'net.minecraftforge.gradle.patcher' version '[6.0.51,6.2)' apply false
     id 'net.minecraftforge.gradle.mcp' version '[6.0.51,6.2)' apply false
     id 'net.minecraftforge.gradlejarsigner' version '1.0.4'
-    id 'org.barfuin.gradle.taskinfo' version '3.0.1'
+    //id 'org.barfuin.gradle.taskinfo' version '3.0.1'
 }
 
 Util.init() //Init all our extension methods!
diff --git a/patches/minecraft/net/minecraft/world/entity/EntityFluidInteraction.java.patch b/patches/minecraft/net/minecraft/world/entity/EntityFluidInteraction.java.patch
index 3832e0d32f..54d1aa113e 100644
--- a/patches/minecraft/net/minecraft/world/entity/EntityFluidInteraction.java.patch
+++ b/patches/minecraft/net/minecraft/world/entity/EntityFluidInteraction.java.patch
@@ -166,7 +166,7 @@
 +    public final boolean isInFluid(java.util.function.BiPredicate<net.minecraftforge.fluids.FluidType, Double> predicate, boolean forAllTypes) {
 +        boolean match = false;
 +        for (var entry : this.trackerByFluidType.entrySet()) {
-+            if (predicate.test(entry.getKey(), entry.getValue().height)) {
++            if (entry.getValue().height > 0 && predicate.test(entry.getKey(), entry.getValue().height)) {
 +                match = true;
 +                if (!forAllTypes)
 +                    return true;