diff --git a/core/assets/maps/craters.mmap b/core/assets/maps/craters.mmap
index aa7d882278..f97e2893a1 100644
Binary files a/core/assets/maps/craters.mmap and b/core/assets/maps/craters.mmap differ
diff --git a/core/assets/maps/ruinousShores.mmap b/core/assets/maps/ruinousShores.mmap
index 28bc2603cf..861c13a1f6 100644
Binary files a/core/assets/maps/ruinousShores.mmap and b/core/assets/maps/ruinousShores.mmap differ
diff --git a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
index dc6966baf5..c2756b4753 100644
--- a/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
+++ b/core/src/io/anuke/mindustry/maps/generators/MapGenerator.java
@@ -120,6 +120,7 @@ public class MapGenerator extends Generator{
 
                     if(distortFloor){
                         tile.setFloor(tiles[newX][newY].floor());
+                        tile.setOre(tiles[newX][newY].ore());
                     }
 
                     for(Decoration decor : decorations){
diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java
index 95bfcb99eb..4d025a86ae 100644
--- a/core/src/io/anuke/mindustry/world/Block.java
+++ b/core/src/io/anuke/mindustry/world/Block.java
@@ -269,6 +269,7 @@ public class Block extends BlockStorage{
 
     public float sumAttribute(Attribute attr, int x, int y){
         Tile tile = world.tile(x, y);
+        if(tile == null) return 0;
         float sum = 0;
         for(Tile other : tile.getLinkedTilesAs(this, tempTiles)){
             sum += other.floor().attributes.get(attr);
diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java
index 0487c66e85..e79efd5c23 100644
--- a/core/src/io/anuke/mindustry/world/blocks/Floor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java
@@ -7,6 +7,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion;
 import io.anuke.arc.math.Mathf;
 import io.anuke.arc.math.geom.Geometry;
 import io.anuke.arc.math.geom.Point2;
+import io.anuke.arc.util.Log;
 import io.anuke.mindustry.content.Blocks;
 import io.anuke.mindustry.content.Fx;
 import io.anuke.mindustry.content.StatusEffects;