From cab1ce47371a2b249b2dbc76fde4b205fc634e04 Mon Sep 17 00:00:00 2001 From: Hubry Date: Fri, 10 Jan 2020 18:17:51 +0100 Subject: [PATCH] Use the entity's speed in tangleberrie pushback, fixes #2085 --- .../common/block/subtile/functional/SubTileJiyuulia.java | 5 +++-- .../block/subtile/functional/SubTileTangleberrie.java | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java index faeebe43c..896e133b7 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileJiyuulia.java @@ -10,6 +10,7 @@ */ package vazkii.botania.common.block.subtile.functional; +import net.minecraft.entity.LivingEntity; import net.minecraft.tileentity.TileEntityType; import net.minecraftforge.registries.ObjectHolder; import vazkii.botania.common.lib.LibMisc; @@ -33,8 +34,8 @@ public class SubTileJiyuulia extends SubTileTangleberrie { } @Override - float getMotionVelocity() { - return -super.getMotionVelocity() * 2; + float getMotionVelocity(LivingEntity entity) { + return -super.getMotionVelocity(entity) * 2; } @Override diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java index 63f30eb84..a7b6953fb 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileTangleberrie.java @@ -63,7 +63,7 @@ public class SubTileTangleberrie extends TileEntityFunctionalFlower { float distance = MathHelper.pointDistanceSpace(x1, y1, z1, x2, y2, z2); if(distance > maxDist && distance < range) { - MathHelper.setEntityMotionFromVector(entity, new Vector3(x1, y1, z1), getMotionVelocity()); + MathHelper.setEntityMotionFromVector(entity, new Vector3(x1, y1, z1), getMotionVelocity(entity)); if(getWorld().rand.nextInt(3) == 0) { world.addParticle(data, x2 + Math.random() * entity.getWidth(), y2 + Math.random() * entity.getHeight(), z2 + Math.random() * entity.getWidth(), 0, 0, 0); } @@ -85,8 +85,8 @@ public class SubTileTangleberrie extends TileEntityFunctionalFlower { return 7; } - float getMotionVelocity() { - return 0.05F; + float getMotionVelocity(LivingEntity entity) { + return Math.max(entity.getAIMoveSpeed() / 2F, 0.05F); } @Override