Skip to content

"Reach" fix #6330

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
BerryRock0 wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Open

"Reach" fix #6330

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
16 changes: 16 additions & 0 deletions src/main/java/meteordevelopment/meteorclient/mixin/PlayerEntityMixin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import net.minecraft.util.hit.BlockHitResult;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.math.Box;
import net.minecraft.world.World;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
Expand Down Expand Up @@ -133,4 +134,19 @@ private double modifyBlockInteractionRange(double original) {
private double modifyEntityInteractionRange(double original) {
return Math.max(0, original + Modules.get().get(Reach.class).entityReach());
}

@Inject(method = "canAttackEntityIn", at = @At("HEAD"), cancellable = true)
private void canReachAttackIn(Box box, double additionalRange, CallbackInfoReturnable<Boolean> cir) {
if (Modules.get().get(Reach.class).isActive()) cir.setReturnValue(true);
}

@Inject(method = "canInteractWithEntityIn", at = @At("HEAD"), cancellable = true)
private void canReachEntityIn(Box box, double additionalRange, CallbackInfoReturnable<Boolean> cir) {
if (Modules.get().get(Reach.class).isActive()) cir.setReturnValue(true);
}

@Inject(method = "canInteractWithBlockAt", at = @At("HEAD"), cancellable = true)
private void canReachBlock(BlockPos pos, double additionalRange, CallbackInfoReturnable<Boolean> cir) {
if (Modules.get().get(Reach.class).isActive()) cir.setReturnValue(true);
}
}