fix: fix crash when playing ships with no ability (#682)

MovingBlocks · Mar 31, 2023 · e37c94c · e37c94c
1 parent 3d015cf
commit e37c94c
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/engine/src/main/java/org/destinationsol/ui/nui/screens/MainGameScreen.java b/engine/src/main/java/org/destinationsol/ui/nui/screens/MainGameScreen.java
@@ -237,6 +237,10 @@ public Float get() {
             @Override
             public UITextureRegion get() {
                 Hero hero = solApplication.getGame().getHero();
+                if (hero.getAbility() == null) {
+                    return null;
+                }
+
                 SolItem example = hero.getAbility().getConfig().getChargeExample();
                 if (example != null) {
                     return Assets.getDSTexture(example.getIcon(solApplication.getGame()).name).getUiTexture();
@@ -247,7 +251,7 @@ public UITextureRegion get() {
             @Override
             public Float get() {
                 Hero hero = solApplication.getGame().getHero();
-                if (hero.getAbilityAwait() > 0) {
+                if (hero.getAbility() != null && hero.getAbilityAwait() > 0) {
                     return 1.0f - hero.getAbilityAwait() / hero.getAbility().getConfig().getRechargeTime();
                 } else {
                     return 1.0f;
@@ -265,6 +269,10 @@ public UITextureRegion get() {
             public Float get() {
                 SolGame game = solApplication.getGame();
                 Hero hero = game.getHero();
+                if (hero.getAbility() == null) {
+                    return 0.0f;
+                }
+
                 SolItem example = hero.getAbility().getConfig().getChargeExample();
                 if (example != null) {
                     return (float) hero.getItemContainer().count(example);
@@ -521,10 +529,12 @@ public void update(float delta) {
             gun2Stats.findAll(UIIconBar.class).iterator().next().setIcon(gun2ClipIcon);
         }
 
-        SolItem example = hero.getAbility().getConfig().getChargeExample();
-        if (example != null) {
-            UITextureRegion abilityIcon = Assets.getDSTexture(example.getIcon(solApplication.getGame()).name).getUiTexture();
-            abilityStats.findAll(UIIconBar.class).iterator().next().setIcon(abilityIcon);
+        if (hero.getAbility() != null) {
+            SolItem example = hero.getAbility().getConfig().getChargeExample();
+            if (example != null) {
+                UITextureRegion abilityIcon = Assets.getDSTexture(example.getIcon(solApplication.getGame()).name).getUiTexture();
+                abilityStats.findAll(UIIconBar.class).iterator().next().setIcon(abilityIcon);
+            }
         }
 
         zoneNameAnnouncer.update(solApplication.getGame(), solApplication.getGame().getContext());