Remove guava

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / world / GameWorldBlocksLogicControllerTask.kt

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt
index c515330d8b51261d55249ab746b25c0c2f2ea3fb..e92b9e2ffb6f6278a01a2fe9d4d82c63454368a4 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt
@@ -25,10 +25,15 @@ class GameWorldBlocksLogicControllerTask @Inject constructor(
     }
 
     private fun updateBlock(x: Int, y: Int) {
-        val block = gameWorld.getForeMapBlock(x, y)
+        val block = gameWorld.getForeMap(x, y)
+
+        if (block.isNone()) {
+            return
+        }
+
         val blockKey = block.params.key
         val action = updateBlockActions[blockKey]
-            ?: updateBlockActions.getRequiresBlockAction().takeIf { block.params.requiresBlock }
+            ?: updateBlockActions.getRequiresBlockAction().takeIf { block.params.run { requiresBlock || isFallable } }
 
         action?.update(x, y)
     }