Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfixes

Browse Source
This commit is contained in:
Anuken
2020-05-12 21:41:45 -04:00
parent ab49825d35
commit c432639dfa
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/ai/BlockIndexer.java
View File

@@ -317,7 +317,7 @@ public class BlockIndexer{
} }
private void process(Tile tile){ 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()); TileArray[] map = getFlagged(tile.team());
for(BlockFlag flag : tile.block().flags){ for(BlockFlag flag : tile.block().flags){

5
core/src/mindustry/game/Schematics.java
View File

@@ -30,7 +30,6 @@ import mindustry.world.blocks.power.*;
import mindustry.world.blocks.production.*; import mindustry.world.blocks.production.*;
import mindustry.world.blocks.sandbox.*; import mindustry.world.blocks.sandbox.*;
import mindustry.world.blocks.storage.*; import mindustry.world.blocks.storage.*;
import mindustry.world.blocks.units.*;
import java.io.*; import java.io.*;
import java.util.zip.*; import java.util.zip.*;
@@ -487,7 +486,7 @@ public class Schematics implements Loadable{
//write each tile //write each tile
for(Stile tile : schematic.tiles){ for(Stile tile : schematic.tiles){
stream.writeByte(blocks.orderedItems().indexOf(tile.block)); 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); TypeIO.writeObject(Writes.get(stream), tile.config);
stream.writeByte(tile.rotation); 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 Sorter || block instanceof Unloader || block instanceof ItemSource) return content.item(value);
if(block instanceof LiquidSource) return content.liquid(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 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; return null;
} }

2
core/src/mindustry/world/meta/BlockFlag.java
View File

@@ -10,6 +10,8 @@ public enum BlockFlag{
turret, turret,
/** Repair point. */ /** Repair point. */
repair, repair,
/** Rally point. TODO remove*/
rally,
/** Any block that boosts unit capacity. */ /** Any block that boosts unit capacity. */
unitModifier; unitModifier;