another fluid mod Conflict fix

baguchi · Nov 18, 2023 · 42dd449 · 42dd449
1 parent c7eed8c
commit 42dd449
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/baguchan/better_with_aquatic/mixin/EntityItemMixin.java b/src/main/java/baguchan/better_with_aquatic/mixin/EntityItemMixin.java
@@ -19,7 +19,9 @@ public EntityItemMixin(World world) {
 
 	@Inject(method = "checkAndHandleWater", at = @At("HEAD"), cancellable = true)
 	public void checkAndHandleWater(CallbackInfoReturnable<Boolean> cir) {
-		cir.setReturnValue(this.world.isMaterialInBB(this.bb, Material.water));
+		if (this.world.isMaterialInBB(this.bb, Material.water)) {
+			cir.setReturnValue(true);
+		}
 	}
 
 	@Inject(method = "tick", at = @At("TAIL"))

diff --git a/src/main/java/baguchan/better_with_aquatic/mixin/EntityMixin.java b/src/main/java/baguchan/better_with_aquatic/mixin/EntityMixin.java
@@ -26,7 +26,9 @@ public class EntityMixin {
 
 	@Inject(method = "checkAndHandleWater", at = @At("HEAD"), cancellable = true)
 	public void checkAndHandleWater(CallbackInfoReturnable<Boolean> cir) {
-		cir.setReturnValue(this.world.isMaterialInBB(this.bb, Material.water));
+		if (this.world.isMaterialInBB(this.bb, Material.water)) {
+			cir.setReturnValue(true);
+		}
 	}
 
 	@Inject(method = "baseTick", at = @At(value = "INVOKE", target = "Lnet/minecraft/core/entity/Entity;checkAndHandleWater()Z", shift = At.Shift.AFTER))