Deleting null

Pulverizer · Feb 26, 2020 · 83abb6e · 83abb6e
1 parent 61884e8
commit 83abb6e
Show file tree

Hide file tree

Showing 14 changed files with 13 additions and 5 deletions.
diff --git a/.gradle/4.4/fileContent/fileContent.lock b/.gradle/4.4/fileContent/fileContent.lock
diff --git a/.gradle/4.4/fileHashes/fileHashes.bin b/.gradle/4.4/fileHashes/fileHashes.bin
diff --git a/.gradle/4.4/fileHashes/fileHashes.lock b/.gradle/4.4/fileHashes/fileHashes.lock
diff --git a/.gradle/4.4/taskHistory/taskHistory.bin b/.gradle/4.4/taskHistory/taskHistory.bin
diff --git a/.gradle/4.4/taskHistory/taskHistory.lock b/.gradle/4.4/taskHistory/taskHistory.lock
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/Movecraft.class b/build/classes/java/main/io/github/pulverizer/movecraft/Movecraft.class
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/craft/Craft.class b/build/classes/java/main/io/github/pulverizer/movecraft/craft/Craft.class
diff --git a/build/libs/movecraft-0.2.0.jar → build/libs/movecraft-0.2.1.jar b/build/libs/movecraft-0.2.0.jar → build/libs/movecraft-0.2.1.jar
diff --git a/build/libs/movecraft.jar b/build/libs/movecraft.jar
diff --git a/build/resources/main/mcmod.info b/build/resources/main/mcmod.info
@@ -2,7 +2,7 @@
     {
         "modid": "movecraft",
         "name": "Movecraft for Sponge",
-        "version": "0.2.1",
+        "version": "0.2.2",
         "description": "Allows players to create moving things out of blocks. Airships, Turrets, Submarines, Etc.",
         "url": "https://github.com/Pulverizer/Movecraft-for-Sponge",
         "authorList": [

diff --git a/build/tmp/generateMetadata/mcmod.info b/build/tmp/generateMetadata/mcmod.info
@@ -2,7 +2,7 @@
     {
         "modid": "movecraft",
         "name": "Movecraft for Sponge",
-        "version": "0.2.1",
+        "version": "0.2.2",
         "description": "Allows players to create moving things out of blocks. Airships, Turrets, Submarines, Etc.",
         "url": "https://github.com/Pulverizer/Movecraft-for-Sponge",
         "authorList": [

diff --git a/src/main/java/io/github/pulverizer/movecraft/Movecraft.java b/src/main/java/io/github/pulverizer/movecraft/Movecraft.java
@@ -39,7 +39,7 @@
         id = "movecraft",
         name = "Movecraft for Sponge",
         description = "Allows players to create moving things out of blocks. Airships, Turrets, Submarines, Etc.",
-        version = "0.2.1",
+        version = "0.2.2",
         url = "https://github.com/Pulverizer/Movecraft-for-Sponge",
         authors = {"BernardisGood", "https://github.com/Pulverizer/Movecraft-for-Sponge/graphs/contributors"})
 

diff --git a/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java b/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java
@@ -465,7 +465,11 @@ public boolean burnFuel(double movePoints) {
             Map<BlockType, Set<Vector3i>> blockMap = hitBox.map(world);
 
             //Find all the furnace blocks
-            getType().getFurnaceBlocks().forEach(blockType -> furnaceBlocks.addAll(blockMap.get(blockType)));
+            getType().getFurnaceBlocks().forEach(blockType -> {
+                if (blockMap.containsKey(blockType)) {
+                    furnaceBlocks.addAll(blockMap.get(blockType));
+                }
+            });
 
             //Find and burn fuel
             for (Vector3i furnaceLocation : furnaceBlocks) {
@@ -515,7 +519,11 @@ public int checkFuelStored() {
         Map<BlockType, Set<Vector3i>> blockMap = hitBox.map(world);
 
         //Find all the furnace blocks
-        getType().getFurnaceBlocks().forEach(blockType -> furnaceBlocks.addAll(blockMap.get(blockType)));
+        getType().getFurnaceBlocks().forEach(blockType -> {
+            if (blockMap.containsKey(blockType)) {
+                furnaceBlocks.addAll(blockMap.get(blockType));
+            }
+        });
 
         //Find and count the fuel
         for (Vector3i furnaceLocation : furnaceBlocks) {