From d5b91eefb41d3abcd7c2539a081195d6b4f5cee7 Mon Sep 17 00:00:00 2001 From: Hubry Date: Sun, 19 Jan 2020 00:39:22 +0100 Subject: [PATCH] Attempt at fixing #3108 Stopping sprint doesn't do much if you are holding ctrl anyways Closes #3108 --- .../common/item/equipment/bauble/ItemFlightTiara.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index 49f6876e5..0d7f16774 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -71,6 +71,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { private static final String TAG_INFINITE_FLIGHT = "infiniteFlight"; private static final String TAG_DASH_COOLDOWN = "dashCooldown"; private static final String TAG_IS_SPRINTING = "isSprinting"; + private static final String TAG_BOOST_PENDING = "boostPending"; private static final List playersWithFlight = Collections.synchronizedList(new ArrayList<>()); private static final int COST = 35; @@ -262,11 +263,12 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem { p.setMotion(p.getMotion().add(look.x, 0, look.z)); p.world.playSound(null, p.posX, p.posY, p.posZ, ModSounds.dash, SoundCategory.PLAYERS, 1F, 1F); ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, maxCd); + ItemNBTHelper.setBoolean(stack, TAG_BOOST_PENDING, true); } else if(cooldown > 0) { - if(maxCd - cooldown < 2) + if(ItemNBTHelper.getBoolean(stack, TAG_BOOST_PENDING, false)) { player.moveRelative(5F, new Vec3d(0F, 0F, 1F)); - else if(maxCd - cooldown < 10) - player.setSprinting(false); + ItemNBTHelper.removeEntry(stack, TAG_BOOST_PENDING); + } ItemNBTHelper.setInt(stack, TAG_DASH_COOLDOWN, cooldown - 2); } } else {