Skip to content

Commit f53a3e8

Browse files
committed
missing safety for disabled screens
1 parent 14b40ed commit f53a3e8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ authors=KQP, Andrew6rant, Sisby folk
1717
contributors=LiamMCW
1818
license=LGPL-3.0-or-later
1919
# Mod Version
20-
baseVersion=1.4.2
20+
baseVersion=1.4.3
2121
# Branch Metadata
2222
branch=1.20
2323
tagBranch=1.20

src/main/java/folk/sisby/inventory_tabs/TabManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ public static boolean mouseReleased(double mouseX, double mouseY, int button) {
237237
}
238238

239239
public static boolean isClickOutsideBounds(double mouseX, double mouseY) {
240-
return !getPageButton(true).contains((int) mouseX, (int) mouseY) && !getPageButton(false).contains((int) mouseX, (int) mouseY) && tabPositions.stream().noneMatch(pos -> getTabArea(pos).contains((int) mouseX, (int) mouseY));
240+
return tabPositions.isEmpty() || !getPageButton(true).contains((int) mouseX, (int) mouseY) && !getPageButton(false).contains((int) mouseX, (int) mouseY) && tabPositions.stream().noneMatch(pos -> getTabArea(pos).contains((int) mouseX, (int) mouseY));
241241
}
242242

243243
public static boolean keyPressed(int keyCode, int scanCode, int modifiers) {

src/main/java/folk/sisby/inventory_tabs/mixin/MixinHandledScreen.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoRet
7474

7575
@Inject(method = "isClickOutsideBounds", at = @At("RETURN"), cancellable = true)
7676
protected void isClickOutsideBounds(double mouseX, double mouseY, int left, int top, int button, CallbackInfoReturnable<Boolean> cir) {
77-
if (cir.getReturnValue()) {
77+
if (inventoryTabs$allowTabs && cir.getReturnValue()) {
7878
cir.setReturnValue(TabManager.isClickOutsideBounds(mouseX, mouseY));
7979
}
8080
}

0 commit comments

Comments
 (0)