From 340ac4e8f51b6df1dcc552a2f5b3db785a76c88f Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Tue, 24 Sep 2024 12:53:37 -0700 Subject: [PATCH] Fix incorrect fluid pushing velocity Forgot to re-assign the flow vector variable with the scaled flow. --- .../moonrise/fabric/mixin/collisions/EntityMixin.java | 2 +- .../moonrise/neoforge/mixin/collisions/EntityMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fabric/src/main/java/ca/spottedleaf/moonrise/fabric/mixin/collisions/EntityMixin.java b/fabric/src/main/java/ca/spottedleaf/moonrise/fabric/mixin/collisions/EntityMixin.java index f1324ce..bc489da 100644 --- a/fabric/src/main/java/ca/spottedleaf/moonrise/fabric/mixin/collisions/EntityMixin.java +++ b/fabric/src/main/java/ca/spottedleaf/moonrise/fabric/mixin/collisions/EntityMixin.java @@ -171,7 +171,7 @@ abstract class EntityMixin { pushVector = pushVector.normalize(); } - pushVector.scale(flowScale); + pushVector = pushVector.scale(flowScale); if (Math.abs(currMovement.x) < 0.003 && Math.abs(currMovement.z) < 0.003 && pushVector.length() < 0.0045000000000000005) { pushVector = pushVector.normalize().scale(0.0045000000000000005); } diff --git a/neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/mixin/collisions/EntityMixin.java b/neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/mixin/collisions/EntityMixin.java index 5eacd79..6e10f2f 100644 --- a/neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/mixin/collisions/EntityMixin.java +++ b/neoforge/src/main/java/ca/spottedleaf/moonrise/neoforge/mixin/collisions/EntityMixin.java @@ -189,7 +189,7 @@ abstract class EntityMixin implements IEntityExtension { pushVector = pushVector.normalize(); } - pushVector.scale(this.getFluidMotionScale(type)); + pushVector = pushVector.scale(this.getFluidMotionScale(type)); if (Math.abs(currMovement.x) < 0.003 && Math.abs(currMovement.z) < 0.003 && pushVector.length() < 0.0045000000000000005) { pushVector = pushVector.normalize().scale(0.0045000000000000005); }