New blocks structure

[cavedroid.git] / core / src / ru / deadsoftware / cavedroid / game / world / GameWorld.java

diff --git a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
index 797e670033ebe4f2abadad58fa96b41cf88b8576..d4a66bcb8ad622ca43193d9df7f9cdb95d24d020 100644 (file)
--- a/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
+++ b/core/src/ru/deadsoftware/cavedroid/game/world/GameWorld.java
@@ -4,8 +4,8 @@ import kotlin.Pair;
 import ru.deadsoftware.cavedroid.game.GameItems;
 import ru.deadsoftware.cavedroid.game.GameScope;
 import ru.deadsoftware.cavedroid.game.mobs.MobsController;
+import ru.deadsoftware.cavedroid.game.model.block.Block;
 import ru.deadsoftware.cavedroid.game.model.world.generator.WorldGeneratorConfig;
-import ru.deadsoftware.cavedroid.game.objects.Block;
 import ru.deadsoftware.cavedroid.game.objects.DropController;
 
 import javax.annotation.CheckForNull;
@@ -139,8 +139,8 @@ public class GameWorld {
             setForeMap(x, y, value);
         } else if (GameItems.isSlab(value) && getForeMap(x, y) == value) {
             final Block block = GameItems.getBlock(value);
-            if (block.getFullBlockKey() != null) {
-                setForeMap(x, y, GameItems.getBlockId(block.getFullBlockKey()));
+            if (block instanceof Block.Slab) {
+                setForeMap(x, y, GameItems.getBlockId(((Block.Slab) block).getFullBlockKey()));
             }
         }
     }