Merge pull request #10 from GTNewHorizons/dev

Fix two NPEs
GTNewHorizons · May 9, 2023 · 18e2808 · 18e2808
2 parents 55bdf43 + 22bcc13
commit 18e2808
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/de/katzenpapst/amunra/block/BlockSlabMeta.java b/src/main/java/de/katzenpapst/amunra/block/BlockSlabMeta.java
@@ -236,8 +236,9 @@ public float getMass(final World w, final int x, final int y, final int z, final
      * @return
      */
     @Override
-    public String getHarvestTool(final int metadata) {
-        return this.getSubBlock(metadata).getHarvestTool(metadata);
+    public String getHarvestTool(int metadata) {
+        final SubBlock sb = this.getSubBlock(metadata);
+        return sb == null ? null : sb.getHarvestTool(metadata);
     }
 
     /**
@@ -248,8 +249,9 @@ public String getHarvestTool(final int metadata) {
      * @return Harvest level, or -1 if not the specified tool type.
      */
     @Override
-    public int getHarvestLevel(final int metadata) {
-        return this.getSubBlock(metadata).getHarvestLevel(metadata);
+    public int getHarvestLevel(int metadata) {
+        final SubBlock sb = this.getSubBlock(metadata);
+        return sb == null ? -1 : sb.getHarvestLevel(metadata);
     }
 
     /**

diff --git a/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java b/src/main/java/de/katzenpapst/amunra/mothership/MothershipWorldProvider.java
@@ -267,7 +267,7 @@ public boolean isDaytime() {
 
     @Override
     public String getDimensionName() {
-        return this.mothershipObj.getLocalizedName();
+        return this.mothershipObj == null ? "Mothership" : this.mothershipObj.getLocalizedName();
     }
 
     @Override