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

Fixed 2 crashes

Browse Source
This commit is contained in:
Anuken
2018-10-20 11:48:59 -04:00
parent 62bb8bce1c
commit ef5478279b
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/ai/Pathfinder.java
View File

@@ -14,6 +14,7 @@ import io.anuke.mindustry.world.meta.BlockFlag;
import io.anuke.ucore.core.Events; import io.anuke.ucore.core.Events;
import io.anuke.ucore.core.Timers; import io.anuke.ucore.core.Timers;
import io.anuke.ucore.util.Geometry; import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Structs;
import static io.anuke.mindustry.Vars.state; import static io.anuke.mindustry.Vars.state;
import static io.anuke.mindustry.Vars.world; import static io.anuke.mindustry.Vars.world;
@@ -82,7 +83,7 @@ public class Pathfinder{
} }
public float getValueforTeam(Team team, int x, int y){ public float getValueforTeam(Team team, int x, int y){
return paths == null || team.ordinal() >= paths.length ? 0 : paths[team.ordinal()].weights[x][y]; return paths == null || team.ordinal() >= paths.length ? 0 : Structs.inBounds(x, y, paths[team.ordinal()].weights) ? paths[team.ordinal()].weights[x][y] : 0;
} }
private boolean passable(Tile tile, Team team){ private boolean passable(Tile tile, Team team){

2
core/src/io/anuke/mindustry/game/Teams.java
View File

@@ -19,8 +19,6 @@ public class Teams{
* @param enemies The array of enemies of this team. Any team not in this array is considered neutral. * @param enemies The array of enemies of this team. Any team not in this array is considered neutral.
*/ */
public void add(Team team, Team... enemies){ public void add(Team team, Team... enemies){
if(map[team.ordinal()] != null) throw new RuntimeException("Can't define team information twice!");
map[team.ordinal()] = new TeamData(team, EnumSet.of(enemies)); map[team.ordinal()] = new TeamData(team, EnumSet.of(enemies));
} }