Refactor rendering

[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 20f992a59fb0b3d07a1b26d47ddd547acf5aec70..387407a841e482fc85dd50a7ff8ab7af1c0f280c 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorldBlocksLogicControllerTask.kt
@@ -1,7 +1,5 @@
 package ru.deadsoftware.cavedroid.game.world
 
-import com.badlogic.gdx.Gdx
-import com.badlogic.gdx.utils.TimeUtils
 import com.badlogic.gdx.utils.Timer.Task
 import ru.deadsoftware.cavedroid.game.GameScope
 import ru.deadsoftware.cavedroid.game.actions.getRequiresBlockAction
@@ -27,10 +25,15 @@ class GameWorldBlocksLogicControllerTask @Inject constructor(
     }
 
     private fun updateBlock(x: Int, y: Int) {
-        val block = gameWorld.getForeMapBlock(x, y)
-        val blockKey = block.key
+        val block = gameWorld.getForeMap(x, y)
+
+        if (block.isNone()) {
+            return
+        }
+
+        val blockKey = block.params.key
         val action = updateBlockActions[blockKey]
-            ?: updateBlockActions.getRequiresBlockAction().takeIf { block.requiresBlock }
+            ?: updateBlockActions.getRequiresBlockAction().takeIf { block.params.requiresBlock }
 
         action?.update(x, y)
     }