Skip to content

Fix NoSlow and FastClimb leaving timer overrides active #6688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
c8dhjp4tyv-bit wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix NoSlow and FastClimb leaving timer overrides active #6688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/movement/FastClimb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,30 +49,39 @@ public class FastClimb extends Module {
.build()
);

private boolean resetTimer;
private boolean hasTimerOverride;

public FastClimb() {
super(Categories.Movement, "fast-climb", "Allows you to climb faster.");
}

@Override
public void onActivate() {
resetTimer = false;
hasTimerOverride = false;
}

@Override
public void onDeactivate() {
resetTimer();
}

@EventHandler
private void onPreTick(TickEvent.Pre event) {
if (timerMode.get()) {
if (climbing()) {
resetTimer = false;
Modules.get().get(Timer.class).setOverride(timer.get());
} else if (!resetTimer) {
Modules.get().get(Timer.class).setOverride(Timer.OFF);
resetTimer = true;
}
if (timerMode.get() && climbing()) {
hasTimerOverride = true;
Modules.get().get(Timer.class).setOverride(timer.get());
} else {
resetTimer();
}
}

private void resetTimer() {
if (!hasTimerOverride) return;

Modules.get().get(Timer.class).setOverride(Timer.OFF);
hasTimerOverride = false;
}

@EventHandler
private void onTick(TickEvent.Post event) {
if (!timerMode.get() && climbing()) {
Expand Down
29 changes: 19 additions & 10 deletions src/main/java/meteordevelopment/meteorclient/systems/modules/movement/NoSlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,20 @@ public class NoSlow extends Module {
.build()
);

private boolean resetTimer;
private boolean hasTimerOverride;

public NoSlow() {
super(Categories.Movement, "no-slow", "Allows you to move normally when using objects that will slow you.");
}

@Override
public void onActivate() {
resetTimer = false;
hasTimerOverride = false;
}

@Override
public void onDeactivate() {
resetTimer();
}

public boolean airStrict() {
Expand Down Expand Up @@ -161,17 +166,21 @@ public boolean slowness() {

@EventHandler
private void onPreTick(TickEvent.Pre event) {
if (web.get() == WebMode.Timer) {
if (mc.level.getBlockState(mc.player.blockPosition()).getBlock() == Blocks.COBWEB && !mc.player.onGround()) {
resetTimer = false;
Modules.get().get(Timer.class).setOverride(webTimer.get());
} else if (!resetTimer) {
Modules.get().get(Timer.class).setOverride(Timer.OFF);
resetTimer = true;
}
if (web.get() == WebMode.Timer && mc.level.getBlockState(mc.player.blockPosition()).getBlock() == Blocks.COBWEB && !mc.player.onGround()) {
hasTimerOverride = true;
Modules.get().get(Timer.class).setOverride(webTimer.get());
} else {
resetTimer();
}
}

private void resetTimer() {
if (!hasTimerOverride) return;

Modules.get().get(Timer.class).setOverride(Timer.OFF);
hasTimerOverride = false;
}

public enum WebMode {
Vanilla,
Timer,
Expand Down
Loading