Removed null

Pulverizer · Feb 25, 2020 · 61884e8 · 61884e8
1 parent f552f4b
commit 61884e8
Show file tree

Hide file tree

Showing 28 changed files with 17 additions and 42 deletions.
diff --git a/.gradle/4.4/fileContent/annotation-processors.bin b/.gradle/4.4/fileContent/annotation-processors.bin
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/fileHashes/resourceHashesCache.bin b/.gradle/4.4/fileHashes/resourceHashesCache.bin
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/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,6 @@ plugins {
 }
 
 group = 'io.github.pulverizer.movecraft'
-version = '0.1.0'
 description = 'Movecraft for Sponge'
 
 repositories {

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/WorldHandler.class b/build/classes/java/main/io/github/pulverizer/movecraft/WorldHandler.class
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/async/AsyncManager.class b/build/classes/java/main/io/github/pulverizer/movecraft/async/AsyncManager.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/classes/java/main/io/github/pulverizer/movecraft/listener/BlockListener.class b/build/classes/java/main/io/github/pulverizer/movecraft/listener/BlockListener.class
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/listener/TNTListener.class b/build/classes/java/main/io/github/pulverizer/movecraft/listener/TNTListener.class
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/sign/StatusSign.class b/build/classes/java/main/io/github/pulverizer/movecraft/sign/StatusSign.class
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/utils/HashHitBox$1.class b/build/classes/java/main/io/github/pulverizer/movecraft/utils/HashHitBox$1.class
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/utils/HashHitBox.class b/build/classes/java/main/io/github/pulverizer/movecraft/utils/HashHitBox.class
diff --git a/build/classes/java/main/io/github/pulverizer/movecraft/utils/HitBox.class b/build/classes/java/main/io/github/pulverizer/movecraft/utils/HitBox.class
diff --git a/build/libs/movecraft-0.1.0.jar → build/libs/movecraft-0.2.0.jar b/build/libs/movecraft-0.1.0.jar → build/libs/movecraft-0.2.0.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,8 +2,8 @@
     {
         "modid": "movecraft",
         "name": "Movecraft for Sponge",
-        "version": "0.1.0",
-        "description": "Allows players to create moving things out of blocks. Airships, Defensive Turrets, Submarines, Etc.",
+        "version": "0.2.1",
+        "description": "Allows players to create moving things out of blocks. Airships, Turrets, Submarines, Etc.",
         "url": "https://github.com/Pulverizer/Movecraft-for-Sponge",
         "authorList": [
             "BernardisGood",

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

diff --git a/src/main/java/io/github/pulverizer/movecraft/Movecraft.java b/src/main/java/io/github/pulverizer/movecraft/Movecraft.java
@@ -38,8 +38,8 @@
 @Plugin(
         id = "movecraft",
         name = "Movecraft for Sponge",
-        description = "Allows players to create moving things out of blocks. Airships, Defensive Turrets, Submarines, Etc.",
-        version = "0.1.0",
+        description = "Allows players to create moving things out of blocks. Airships, Turrets, Submarines, Etc.",
+        version = "0.2.1",
         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/async/AsyncManager.java b/src/main/java/io/github/pulverizer/movecraft/async/AsyncManager.java
@@ -188,7 +188,7 @@ private void detectSinking(){
                 int count = 0;
 
                 for (BlockType blockType : blockTypes) {
-                    count += blockMap.get(blockType).size();
+                        count += blockMap.containsKey(blockType) ? blockMap.get(blockType).size() : 0;
                 }
 
                 foundFlyBlocks.put(blockTypes, count);
@@ -198,15 +198,18 @@ private void detectSinking(){
                 int count = 0;
 
                 for (BlockType blockType : blockTypes) {
-                    count += blockMap.get(blockType).size();
+                    count += blockMap.containsKey(blockType) ? blockMap.get(blockType).size() : 0;
                 }
 
                 foundMoveBlocks.put(blockTypes, count);
             });
 
-            totalNonAirBlocks = craft.getHitBox().size() - blockMap.get(BlockTypes.AIR).size();
+            totalNonAirBlocks = craft.getHitBox().size() - (blockMap.containsKey(BlockTypes.AIR) ? blockMap.get(BlockTypes.AIR).size() : 0);
 
-            totalNonAirWaterBlocks = craft.getHitBox().size() - (blockMap.get(BlockTypes.AIR).size() + blockMap.get(BlockTypes.FLOWING_WATER).size() + blockMap.get(BlockTypes.WATER).size());
+            totalNonAirWaterBlocks = craft.getHitBox().size() - (
+                    (blockMap.containsKey(BlockTypes.AIR) ? blockMap.get(BlockTypes.AIR).size() : 0)
+                    + (blockMap.containsKey(BlockTypes.AIR) ? blockMap.get(BlockTypes.FLOWING_WATER).size() : 0)
+                    + (blockMap.containsKey(BlockTypes.AIR) ? blockMap.get(BlockTypes.WATER).size() : 0));
 
             // now see if any of the resulting percentages
             // are below the threshold specified in

diff --git a/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java b/src/main/java/io/github/pulverizer/movecraft/craft/Craft.java
@@ -664,7 +664,10 @@ public int getTickCooldown() {
         if(state == CraftState.SINKING)
             return type.getSinkRateTicks();
 
-        double chestPenalty = blockMap.get(BlockTypes.CHEST).size() + blockMap.get(BlockTypes.TRAPPED_CHEST).size();
+        double chestPenalty = 0;
+
+        chestPenalty += (blockMap.containsKey(BlockTypes.CHEST) ? blockMap.get(BlockTypes.CHEST).size() : 0)
+                + (blockMap.containsKey(BlockTypes.TRAPPED_CHEST) ? blockMap.get(BlockTypes.TRAPPED_CHEST).size() : 0);
 
         chestPenalty *= type.getChestPenalty();
 

diff --git a/src/main/java/io/github/pulverizer/movecraft/utils/SignUtils.java b/src/main/java/io/github/pulverizer/movecraft/utils/SignUtils.java