aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYasin <LifeIsAParadox@users.noreply.github.com>2022-04-06 10:34:21 +0200
committerGitHub <noreply@github.com>2022-04-06 10:34:21 +0200
commit481ea9be68c316ff362c64457f72968ec72120d5 (patch)
tree1fb854a583f647c5013d12171d4225daf5961017
parent30fed24fd00dd8dfa0ff0de4c319cc9ad2273717 (diff)
parent0fda7a86daf04f9ac0de54492629e38d290af887 (diff)
downloadSkyblocker-481ea9be68c316ff362c64457f72968ec72120d5.tar.gz
Skyblocker-481ea9be68c316ff362c64457f72968ec72120d5.tar.bz2
Skyblocker-481ea9be68c316ff362c64457f72968ec72120d5.zip
Merge pull request #64 from TacoMonkey11/patch-1
fix crash when not hovering over a slot while trying to use wikilookup
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
index b1bb0d93..bd99f2d4 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
@@ -47,8 +47,10 @@ public abstract class HandledScreenMixin extends Screen {
@Inject(at = @At("HEAD"), method = "keyPressed", cancellable = true)
public void keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
- if (keyCode != 256 && !MinecraftClient.getInstance().options.inventoryKey.matchesKey(keyCode, scanCode)){
- if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot);
+ if (focusedSlot != null){
+ if (keyCode != 256 && !MinecraftClient.getInstance().options.inventoryKey.matchesKey(keyCode, scanCode)){
+ if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(focusedSlot);
+ }
}
}