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

Fixed #1319

Browse Source
This commit is contained in:
Anuken
2020-01-04 12:10:03 -05:00
parent 7fa61eaf3b
commit 197769a9fe
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -142,6 +142,7 @@ public class Schematics implements Loadable{
ui.showException(e); ui.showException(e);
} }
} }
all.sort();
} }
public void savePreview(Schematic schematic, Fi file){ public void savePreview(Schematic schematic, Fi file){
@@ -280,6 +281,7 @@ public class Schematics implements Loadable{
ui.showException(e); ui.showException(e);
Log.err(e); Log.err(e);
} }
all.sort();
} }
public void remove(Schematic s){ public void remove(Schematic s){
@@ -292,6 +294,7 @@ public class Schematics implements Loadable{
previews.get(s).dispose(); previews.get(s).dispose();
previews.remove(s); previews.remove(s);
} }
all.sort();
} }
/** Creates a schematic from a world selection. */ /** Creates a schematic from a world selection. */

3
core/src/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -262,6 +262,7 @@ public class MassDriver extends Block{
} }
protected boolean shooterValid(Tile tile, Tile other){ protected boolean shooterValid(Tile tile, Tile other){
if(other == null) return true; if(other == null) return true;
if(!(other.block() instanceof MassDriver)) return false; if(!(other.block() instanceof MassDriver)) return false;
MassDriverEntity entity = other.ent(); MassDriverEntity entity = other.ent();
@@ -274,7 +275,7 @@ public class MassDriver extends Block{
if(entity == null || entity.link == -1) return false; if(entity == null || entity.link == -1) return false;
Tile link = world.tile(entity.link); Tile link = world.tile(entity.link);
return link != null && link.block() instanceof MassDriver && tile.dst(link) <= range; return link != null && link.block() instanceof MassDriver && link.getTeam() == tile.getTeam() && tile.dst(link) <= range;
} }
public static class DriverBulletData implements Poolable{ public static class DriverBulletData implements Poolable{