From 5c7083733725cbb2eae8831d9b642f125a295516 Mon Sep 17 00:00:00 2001
From: Aaron <51387595+AzureAaron@users.noreply.github.com>
Date: Mon, 25 Mar 2024 23:00:19 -0400
Subject: Fix wiki lookup NPE & set official wiki as default

---
 src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java          | 2 +-
 src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java         | 2 +-
 src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index a3e710c1..2c260e3f 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -619,7 +619,7 @@ public class SkyblockerConfig {
 		public boolean enableWikiLookup = true;
 
 		@SerialEntry
-		public boolean officialWiki = false;
+		public boolean officialWiki = true;
 	}
 
 	public static class ChestValue {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
index 38121ea3..5815c11f 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/item/WikiLookup.java
@@ -40,7 +40,7 @@ public class WikiLookup {
             getSkyblockId(slot);
             try {
                 String wikiLink = ItemRepository.getWikiLink(id, player);
-                CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink));
+                if (wikiLink != null) CompletableFuture.runAsync(() -> Util.getOperatingSystem().open(wikiLink));
             } catch (IndexOutOfBoundsException | IllegalStateException e) {
                 LOGGER.error("[Skyblocker] Error while retrieving wiki article...", e);
                 if (player != null) {
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java
index bd2ac27a..3379b693 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/itemlist/ItemRepository.java
@@ -69,7 +69,7 @@ public class ItemRepository {
 
     public static String getWikiLink(String internalName, PlayerEntity player) {
         NEUItem item = NEURepoManager.NEU_REPO.getItems().getItemBySkyblockId(internalName);
-        if (item == null || item.getInfo().isEmpty()) {
+        if (item == null || item.getInfo() == null || item.getInfo().isEmpty()) {
             warnNoWikiLink(player);
             return null;
         }
-- 
cgit