Merge #1123 (squid/dolphin filter fix) into v7.47

Wurst-Imperium · Feb 28, 2025 · 291c6c0 · 291c6c0
2 parents 000cc6c + f3aecfd
commit 291c6c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java b/src/main/java/net/wurstclient/clickgui/components/RadarComponent.java
@@ -17,6 +17,7 @@
 import net.minecraft.entity.mob.Monster;
 import net.minecraft.entity.mob.WaterCreatureEntity;
 import net.minecraft.entity.passive.AnimalEntity;
+import net.minecraft.entity.passive.WaterAnimalEntity;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
@@ -114,7 +115,8 @@ private int getEntityColor(Entity e)
 		if(e instanceof Monster)
 			return 0xFFFF8000;
 		if(e instanceof AnimalEntity || e instanceof AmbientEntity
-			|| e instanceof WaterCreatureEntity)
+			|| e instanceof WaterCreatureEntity
+			|| e instanceof WaterAnimalEntity)
 			return 0xFF00FF00;
 		return 0xFF808080;
 	}

diff --git a/src/main/java/net/wurstclient/settings/filters/FilterPassiveSetting.java b/src/main/java/net/wurstclient/settings/filters/FilterPassiveSetting.java
@@ -14,6 +14,7 @@
 import net.minecraft.entity.mob.WaterCreatureEntity;
 import net.minecraft.entity.passive.AnimalEntity;
 import net.minecraft.entity.passive.PufferfishEntity;
+import net.minecraft.entity.passive.WaterAnimalEntity;
 
 public final class FilterPassiveSetting extends EntityFilterCheckbox
 {
@@ -37,7 +38,8 @@ public boolean test(Entity e)
 			return true;
 
 		return !(e instanceof AnimalEntity || e instanceof AmbientEntity
-			|| e instanceof WaterCreatureEntity);
+			|| e instanceof WaterCreatureEntity
+			|| e instanceof WaterAnimalEntity);
 	}
 
 	public static FilterPassiveSetting genericCombat(boolean checked)

diff --git a/src/main/java/net/wurstclient/settings/filters/FilterPassiveWaterSetting.java b/src/main/java/net/wurstclient/settings/filters/FilterPassiveWaterSetting.java
@@ -11,6 +11,7 @@
 import net.minecraft.entity.mob.WaterCreatureEntity;
 import net.minecraft.entity.passive.AxolotlEntity;
 import net.minecraft.entity.passive.PufferfishEntity;
+import net.minecraft.entity.passive.WaterAnimalEntity;
 
 public final class FilterPassiveWaterSetting extends EntityFilterCheckbox
 {
@@ -31,7 +32,7 @@ public boolean test(Entity e)
 			return true;
 
 		return !(e instanceof WaterCreatureEntity
-			|| e instanceof AxolotlEntity);
+			|| e instanceof WaterAnimalEntity || e instanceof AxolotlEntity);
 	}
 
 	public static FilterPassiveWaterSetting genericCombat(boolean checked)