diff options
| author | msg-programs <msgdoesstuff@gmail.com> | 2023-09-03 10:46:28 +0200 |
|---|---|---|
| committer | msg-programs <msgdoesstuff@gmail.com> | 2023-09-03 10:46:28 +0200 |
| commit | c916d2020fcb9ead7a6e23f218e34627d02b0680 (patch) | |
| tree | 4c009f62cdef703666007a997e9a7cb83e573223 /src/main/java/me/xmrvizzy/skyblocker/skyblock | |
| parent | af8a95bb8f3cb8c53959fc51c8208b10093a3a27 (diff) | |
| download | Skyblocker-c916d2020fcb9ead7a6e23f218e34627d02b0680.tar.gz Skyblocker-c916d2020fcb9ead7a6e23f218e34627d02b0680.tar.bz2 Skyblocker-c916d2020fcb9ead7a6e23f218e34627d02b0680.zip | |
Fix bugs that cause crashes when the text at some position is null.
Diffstat (limited to 'src/main/java/me/xmrvizzy/skyblocker/skyblock')
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/GoodToKnowWidget.java | 12 | ||||
| -rw-r--r-- | src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/GoodToKnowWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/GoodToKnowWidget.java index e3b462a9..841b3e32 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/GoodToKnowWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/GoodToKnowWidget.java @@ -31,17 +31,17 @@ public class GoodToKnowWidget extends Widget { // Check each position to see what is or isn't there so we don't try adding // invalid components - if (pos49.getString().contains("times")) + if (pos49 != null && pos49.getString().contains("times")) visitedRiftPos = 49; - if (pos51.getString().contains("Motes")) + if (pos51 != null && pos51.getString().contains("Motes")) lifetimeMotesPos = 51; - if (pos51.getString().contains("times")) + if (pos51 != null && pos51.getString().contains("times")) visitedRiftPos = 51; - if (pos53.getString().contains("Motes")) + if (pos53 != null && pos53.getString().contains("Motes")) lifetimeMotesPos = 53; - Text timesVisitedRift = (visitedRiftPos == 51) ? pos51 : (visitedRiftPos == 49) ? pos49 : null; - Text lifetimeMotesEarned = (lifetimeMotesPos == 53) ? pos53 : (lifetimeMotesPos == 51) ? pos51 : null; + Text timesVisitedRift = (visitedRiftPos == 51) ? pos51 : (visitedRiftPos == 49) ? pos49 : Text.of("No Data"); + Text lifetimeMotesEarned = (lifetimeMotesPos == 53) ? pos53 : (lifetimeMotesPos == 51) ? pos51 : Text.of("No Data"); if (visitedRiftPos != 0) { this.addComponent(new IcoTextComponent(Ico.EXPERIENCE_BOTTLE, diff --git a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java index 375a41b9..8ba6eece 100644 --- a/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java +++ b/src/main/java/me/xmrvizzy/skyblocker/skyblock/tabhud/widget/rift/RiftProgressWidget.java @@ -40,9 +40,9 @@ public class RiftProgressWidget extends Widget { // Check each position to see what is or isn't there so we don't try adding // invalid components - if (pos45.contains("Timecharms")) + if (pos45 != null && pos45.contains("Timecharms")) hasTimecharms = true; - if (pos46.contains("Enigma Souls")) + if (pos46 != null && pos46.contains("Enigma Souls")) hasEnigmaSouls = true; // Small ternary to account for positions, defaults to -1 if it for some reason |