aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/me
diff options
context:
space:
mode:
authorKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-06-21 18:10:26 +0800
committerKevinthegreat <92656833+kevinthegreat1@users.noreply.github.com>2023-06-24 12:57:17 +0800
commite4b5090141ff10983c0d443d0f21b0c60d27f049 (patch)
treea26e46b5ffb00c57faa53d9c50f390175e1f7dec /src/main/java/me
parent28d137d777ad1e78043f4639d8fbadd0d3392d2c (diff)
downloadSkyblocker-e4b5090141ff10983c0d443d0f21b0c60d27f049.tar.gz
Skyblocker-e4b5090141ff10983c0d443d0f21b0c60d27f049.tar.bz2
Skyblocker-e4b5090141ff10983c0d443d0f21b0c60d27f049.zip
Add null checks
Diffstat (limited to 'src/main/java/me')
-rw-r--r--src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java4
1 files changed, 2 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 b715560e..431880e5 100644
--- a/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
+++ b/src/main/java/me/xmrvizzy/skyblocker/mixin/HandledScreenMixin.java
@@ -42,7 +42,7 @@ public abstract class HandledScreenMixin extends Screen {
@Inject(at = @At("HEAD"), method = "keyPressed")
public void skyblocker$keyPressed(int keyCode, int scanCode, int modifiers, CallbackInfoReturnable<Boolean> cir) {
- if (this.focusedSlot != null) {
+ if (this.client != null && this.focusedSlot != null) {
if (keyCode != 256 && !this.client.options.inventoryKey.matchesKey(keyCode, scanCode)) {
if (WikiLookup.wikiLookup.matchesKey(keyCode, scanCode)) WikiLookup.openWiki(this.focusedSlot);
}
@@ -62,7 +62,7 @@ public abstract class HandledScreenMixin extends Screen {
// Backpack Preview
String title = this.getTitle().getString();
boolean shiftDown = SkyblockerConfig.get().general.backpackPreviewWithoutShift ^ Screen.hasShiftDown();
- if (shiftDown && title.equals("Storage") && this.focusedSlot != null) {
+ if (this.client != null && this.client.player != null && this.focusedSlot != null && shiftDown && title.equals("Storage")) {
if (this.focusedSlot.inventory == this.client.player.getInventory()) return;
if (BackpackPreview.renderPreview(context, this.focusedSlot.getIndex(), x, y)) ci.cancel();
}