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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/src/io/anuke/mindustry/core/Renderer.java
This commit is contained in:
Anuken
2018-10-08 19:55:51 -04:00
parent 940ad84493 0b168376ed
commit f28fa93f40
31 changed files with 730 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,7 +159,7 @@ public class BlockIndexer{
* Find the closest ore block relative to a position.
*/
public Tile findClosestOre(float xp, float yp, Item item){
Tile tile = Geometry.findClosest(xp, yp, world.indexer().getOrePositions(item));
Tile tile = Geometry.findClosest(xp, yp, world.indexer.getOrePositions(item));
if(tile == null) return null;

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

@@ -111,7 +111,7 @@ public class Pathfinder{
path.lastSearchTime = TimeUtils.millis();
Array<Tile> set = world.indexer().getEnemy(team, BlockFlag.target);
Array<Tile> set = world.indexer.getEnemy(team, BlockFlag.target);
for(Tile other : set){
path.weights[other.x][other.y] = 0;
path.searches[other.x][other.y] = path.search;

2
core/src/io/anuke/mindustry/ai/WaveSpawner.java
View File

@@ -156,7 +156,7 @@ public class WaveSpawner{
for(int y = quady * quadsize; y < world.height() && y < (quady + 1) * quadsize; y++){
Tile tile = world.tile(x, y);
if(tile == null || tile.solid() || world.pathfinder().getValueforTeam(Team.red, x, y) == Float.MAX_VALUE){
if(tile == null || tile.solid() || world.pathfinder.getValueforTeam(Team.red, x, y) == Float.MAX_VALUE){
setQuad(quadx, quady, false);
break outer;
}