diff --git a/core/src/mindustry/ai/BlockIndexer.java b/core/src/mindustry/ai/BlockIndexer.java index fd312cc138..c159294876 100644 --- a/core/src/mindustry/ai/BlockIndexer.java +++ b/core/src/mindustry/ai/BlockIndexer.java @@ -317,7 +317,7 @@ public class BlockIndexer{ } private void process(Tile tile){ - if(tile.block().flags.size() > 0 && tile.team() != Team.derelict){ + if(tile.block().flags.size() > 0 && tile.team() != Team.derelict && tile.isCenter()){ TileArray[] map = getFlagged(tile.team()); for(BlockFlag flag : tile.block().flags){ diff --git a/core/src/mindustry/game/Schematics.java b/core/src/mindustry/game/Schematics.java index 43d9d96e35..7c1374dad0 100644 --- a/core/src/mindustry/game/Schematics.java +++ b/core/src/mindustry/game/Schematics.java @@ -30,7 +30,6 @@ import mindustry.world.blocks.power.*; import mindustry.world.blocks.production.*; import mindustry.world.blocks.sandbox.*; import mindustry.world.blocks.storage.*; -import mindustry.world.blocks.units.*; import java.io.*; import java.util.zip.*; @@ -487,7 +486,7 @@ public class Schematics implements Loadable{ //write each tile for(Stile tile : schematic.tiles){ stream.writeByte(blocks.orderedItems().indexOf(tile.block)); - stream.writeInt(Point2.pack((int)tile.x, (int)tile.y)); + stream.writeInt(Point2.pack(tile.x, tile.y)); TypeIO.writeObject(Writes.get(stream), tile.config); stream.writeByte(tile.rotation); } @@ -499,7 +498,7 @@ public class Schematics implements Loadable{ if(block instanceof Sorter || block instanceof Unloader || block instanceof ItemSource) return content.item(value); if(block instanceof LiquidSource) return content.liquid(value); if(block instanceof MassDriver || block instanceof ItemBridge) return Point2.unpack(value).sub(Point2.x(position), Point2.y(position)); - if(block instanceof LightBlock || block instanceof CommandCenter) return value; + if(block instanceof LightBlock) return value; return null; } diff --git a/core/src/mindustry/world/meta/BlockFlag.java b/core/src/mindustry/world/meta/BlockFlag.java index 9a79b68d54..2308448e45 100644 --- a/core/src/mindustry/world/meta/BlockFlag.java +++ b/core/src/mindustry/world/meta/BlockFlag.java @@ -10,6 +10,8 @@ public enum BlockFlag{ turret, /** Repair point. */ repair, + /** Rally point. TODO remove*/ + rally, /** Any block that boosts unit capacity. */ unitModifier;