fix launching forward when moving from still with an active firework

Author: beanbag44

src/main/kotlin/com/lambda/interaction/managers/rotating/RotationRequest.kt

@@ -67,8 +67,10 @@ interface IRotationRequest : Automated {
 		override val done
 			get() =
 				runSafe {
-					val delta = (if (BaritoneHandler.isActive) player.rotation else RotationManager.activeRotation)
-						.yaw - (yaw.value ?: return@runSafe false)
+					val rot =
+						if (BaritoneHandler.isActive) player.rotation
+						else RotationManager.activeRotation
+					val delta = rot.yaw - (yaw.value ?: return@runSafe false)
 					val wrappedDelta = ((delta + 180) % 360 + 360) % 360 - 180
 					abs(wrappedDelta) <= 0.001
 				} == true
@@ -92,8 +94,10 @@ interface IRotationRequest : Automated {
 		override val done
 			get() =
 				runSafe {
-					abs((if (BaritoneHandler.isActive) player.rotation else RotationManager.activeRotation)
-						.pitch - (pitch.value ?: return@runSafe false)) <= 0.001
+					val rot =
+						if (BaritoneHandler.isActive) player.rotation
+						else RotationManager.activeRotation
+					abs(rot.pitch - (pitch.value ?: return@runSafe false)) <= 0.001
 				} == true
 
 		override fun dist(rotation: Rotation): Double {
@@ -117,8 +121,10 @@ interface IRotationRequest : Automated {
 		override val done
 			get() =
 				runSafe {
-					(if (BaritoneHandler.isActive) player.rotation else RotationManager.activeRotation)
-						.dist(rotation.value ?: return@runSafe false) <= 0.001
+					val rot =
+						if (BaritoneHandler.isActive) player.rotation
+						else RotationManager.activeRotation
+					rot.dist(rotation.value ?: return@runSafe false) <= 0.001
 				} == true
 
 		override fun dist(rotation: Rotation) =
@@ -204,4 +210,4 @@ interface IRotationRequest : Automated {
 			}
 		}
 	}
-}
+}

src/main/kotlin/com/lambda/module/modules/movement/elytrafly/ElytraFly.kt

@@ -58,7 +58,7 @@ object ElytraFly : Module(
     private val boostSpeed by setting("Boost", 0.0, 0.0..0.5, 0.005, description = "Speed to add when flying")
     private val rocketSpeed by setting("Rocket Speed", 1.0, 0.0..2.0, 0.01, description = "Speed multiplier that the rocket gives you")
     private val angledRocketBoost by setting("Angled Rocket Boost", true, description = "Automatically scale the firework rocket boost based on your pitch angle")
-    private val maxAngledBoost by setting("Max Angled Boost", 0.75, 0.0..5.0, 0.05, description = "Additional speed added on top of your base rocket speed when flying diagonally at exactly 45 degrees") { angledRocketBoost }
+    private val maxAngledBoost by setting("Max Angled Boost", 0.75, 0.0..5.0, 0.01, description = "Additional speed added on top of your base rocket speed when flying diagonally at exactly 45 degrees") { angledRocketBoost }
     private val mute by setting("Mute Elytra", false, "Mutes the elytra sound when gliding")
     @JvmStatic val fakeFly by setting("Fake Fly", false, "Rapidly swaps the chestplate and elytra to give the appearance the player is flying without an elytra. May also reduce durability loss")
 
@@ -106,27 +106,28 @@ object ElytraFly : Module(
     }
 
     @JvmStatic
-    fun boostRocket() = runSafe {
-	    val rot = RotationManager.activeRotation
-        
-        var targetSpeed = 1.5 * rocketSpeed
-        if (angledRocketBoost) {
-            val scale = sin(Math.toRadians(abs(rot.pitch) * 2.0))
-            targetSpeed = (1.5 * rocketSpeed) + (maxAngledBoost * scale)
-        }
+    fun boostRocket() =
+        runSafe {
+            val rot = RotationManager.activeRotation
+
+            var targetSpeed = 1.5 * rocketSpeed
+            if (angledRocketBoost) {
+                val scale = sin(Math.toRadians(abs(rot.pitch) * 2.0))
+                targetSpeed = (1.5 * rocketSpeed) + (maxAngledBoost * scale)
+            }
 
-	    val vec = Vec3d.fromPolar(rot.pitchF, rot.yawF)
-	    val velocity = player.velocity
+	        val vec = Vec3d.fromPolar(rot.pitchF, rot.yawF)
+	        val velocity = player.velocity
 
-	    val d = targetSpeed
-	    val e = 0.1 * rocketSpeed
+	        val d = targetSpeed
+	        val e = 0.1 * rocketSpeed
 
-	    player.velocity = velocity.add(
-		    vec.x * e + (vec.x * d - velocity.x) * 0.5,
-		    vec.y * e + (vec.y * d - velocity.y) * 0.5,
-		    vec.z * e + (vec.z * d - velocity.z) * 0.5
-	    )
-    }
+	        player.velocity = velocity.add(
+	    	    vec.x * e + (vec.x * d - velocity.x) * 0.5,
+	    	    vec.y * e + (vec.y * d - velocity.y) * 0.5,
+	    	    vec.z * e + (vec.z * d - velocity.z) * 0.5
+	        )
+        }
 
     enum class FlyMode(private val elytraFlyGetter: () -> ElytraFlyMode) {
         Bounce({ bounceMode }),

src/main/kotlin/com/lambda/module/modules/movement/elytrafly/modes/GrimControlElytraFly.kt

@@ -89,7 +89,7 @@ class GrimControlElytraFly(
 			if (mc.options.sneakKey.isPressed) vec = vec.add(Vec3d(0.0, -1.0, 0.0))
 
 			val prevStill = still
-			still = (vec.lengthSquared() < 1e-4 || Freecam.isEnabled)
+			still = vec.lengthSquared() < 1e-4 || Freecam.isEnabled
 			if (still) moving = false
 
 			if (still && flipFlopMode != FlipFlopMode.Full) {
@@ -99,22 +99,29 @@ class GrimControlElytraFly(
 			} else {
 				if (fireworkTimer.timePassed(lastDuration.seconds - safetyMargin.seconds)) {
 					val firework = findFirework()
-					hasFirework = firework != null
-					if (firework == null) return@listen
+					if (firework == null) {
+						hasFirework = false
+						return@listen
+					}
 					lastDuration = (firework.get(DataComponentTypes.FIREWORKS)?.flightDuration ?: 1) * 0.5 + 0.5
 					startFirework(inventory)
 					fireworkTimer.reset()
+				} else {
+					hasFirework = hasFirework or player.hasFirework
 				}
 			}
 
 			if (still) {
 				rotationRequest { rotation(if (flipFlop) 0.0 else 180.0, 0.0) }.submit()
 				flipFlop = !flipFlop
-			} else {
+				return@listen
+			}
+
+			val rot = vec.yawAndPitch
+			rotationRequest { rotation(rot.y, rot.x) }.submit()
+			if (hasFirework) {
 				moving = true
-				if (prevStill && !player.hasFirework) player.velocity = Vec3d.ZERO
-				val rot = vec.yawAndPitch
-				rotationRequest { rotation(rot.y, rot.x) }.submit()
+				if (prevStill) player.velocity = Vec3d.ZERO
 			}
 		}