Make blockFreeLook depend on freeLook

This commit is contained in:
Brady
2023-07-02 19:59:26 -05:00
parent 8211ae4af5
commit 6654476da4
2 changed files with 4 additions and 5 deletions

View File

@@ -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);

View File

@@ -135,10 +135,10 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
}
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 @@ public final class LookBehavior extends Behavior implements ILookBehavior {
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