From 6654476da435203df9f5f42ed9f41310f5560c30 Mon Sep 17 00:00:00 2001
From: Brady <zeromemesdev@gmail.com>
Date: Sun, 2 Jul 2023 19:59:26 -0500
Subject: [PATCH] Make `blockFreeLook` depend on `freeLook`
---
src/api/java/baritone/api/Settings.java | 3 +--
src/main/java/baritone/behavior/LookBehavior.java | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/api/java/baritone/api/Settings.java b/src/api/java/baritone/api/Settings.java
index a8e4ced7d..da241d6ba 100644
--- a/src/api/java/baritone/api/Settings.java
+++ b/src/api/java/baritone/api/Settings.java
@@ -731,8 +731,7 @@ public final class Settings {
public final Setting<Boolean> freeLook = new Setting<>(true);
/**
- * Break and place blocks without having to force the client-sided rotations. Having this setting enabled implies
- * {@link #freeLook}.
+ * Break and place blocks without having to force the client-sided rotations. Requires {@link #freeLook}.
*/
public final Setting<Boolean> blockFreeLook = new Setting<>(false);
diff --git a/src/main/java/baritone/behavior/LookBehavior.java b/src/main/java/baritone/behavior/LookBehavior.java
index d438e8f85..372cf1aae 100644
--- a/src/main/java/baritone/behavior/LookBehavior.java
+++ b/src/main/java/baritone/behavior/LookBehavior.java
@@ -135,10 +135,10 @@ public void pig() {
}
public Optional<Rotation> getEffectiveRotation() {
- if (Baritone.settings().freeLook.value || Baritone.settings().blockFreeLook.value) {
+ if (Baritone.settings().freeLook.value) {
return Optional.ofNullable(this.serverRotation);
}
- // If neither of the freeLook settings are on, just defer to the player's actual rotations
+ // If freeLook isn't on, just defer to the player's actual rotations
return Optional.empty();
}
@@ -306,7 +306,7 @@ static Mode resolve(boolean blockInteract) {
final boolean blockFreeLook = settings.blockFreeLook.value;
final boolean freeLook = settings.freeLook.value;
- if (!freeLook && !blockFreeLook) return CLIENT;
+ if (!freeLook) return CLIENT;
if (!blockFreeLook && blockInteract) return CLIENT;
// Regardless of if antiCheatCompatibility is enabled, if a blockInteract is requested then the player