From eb4109e4876344ca5904f8d0c13bd76346699887 Mon Sep 17 00:00:00 2001 From: Evan Debenham Date: Wed, 7 Oct 2020 21:21:58 -0400 Subject: [PATCH] v0.9.0a: added some null safety checks --- .../shatteredpixeldungeon/actors/mobs/Spinner.java | 1 + .../shatteredpixeldungeon/items/rings/RingOfWealth.java | 1 + .../shatteredpixeldungeon/services/news/News.java | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java index f3048196e..ff7374311 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Spinner.java @@ -145,6 +145,7 @@ public class Spinner extends Mob { public int webPos(){ + Char enemy = this.enemy; if (enemy == null) return -1; Ballistica b; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java index f93bb403e..c5cc74e32 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/rings/RingOfWealth.java @@ -154,6 +154,7 @@ public class RingOfWealth extends Ring { private static int latestDropTier = 0; public static void showFlareForBonusDrop( Visual vis ){ + if (vis == null) return; switch (latestDropTier){ default: break; //do nothing diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java index aa52b118b..441403bf2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/services/news/News.java @@ -71,7 +71,7 @@ public class News { private static ArrayList articles; public static synchronized boolean articlesAvailable(){ - return articles != null; + return articles != null && !articles.isEmpty(); } public static synchronized ArrayList articles(){