Skip to content

Targeted Module Bug Fix #216

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
wants to merge 1 commit into
base: MC1.18.2-master
Choose a base branch
from
Open

Targeted Module Bug Fix #216

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
10 changes: 9 additions & 1 deletion src/main/java/me/desht/modularrouters/item/module/TargetedModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public abstract class TargetedModule extends ModuleItem {

@Override
public InteractionResult useOn(UseOnContext ctx) {
if (ctx.getPlayer() != null && ctx.getPlayer().isCrouching()) {
if (canPlayerUse(ctx.getPlayer())) {
if (isValidTarget(ctx)) {
if (getMaxTargets() == 1) {
handleSingleTarget(ctx.getItemInHand(), ctx.getPlayer(), ctx.getLevel(), ctx.getClickedPos(), ctx.getClickedFace());
Expand All @@ -70,6 +70,14 @@ public InteractionResult useOn(UseOnContext ctx) {
}
}

private boolean canPlayerUse(Player p) {
if (p != null) {
return (p.isCrouching() || (p.isShiftKeyDown() && (p.isVisuallyCrawling() || p.isVisuallySwimming())));
} else {
return false;
}
}

protected boolean isValidTarget(UseOnContext ctx) {
return InventoryUtils.getInventory(ctx.getLevel(), ctx.getClickedPos(), ctx.getClickedFace()).isPresent();
}
Expand Down