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

Unbroke pathfinding

Browse Source
This commit is contained in:
Anuken
2018-11-05 21:43:26 -05:00
parent 184e52b4ec
commit 6d88111dfc
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,7 +2,6 @@ package io.anuke.mindustry.ai;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.*; import com.badlogic.gdx.utils.*;
import com.badlogic.gdx.utils.Bits;
import io.anuke.mindustry.content.blocks.Blocks; import io.anuke.mindustry.content.blocks.Blocks;
import io.anuke.mindustry.entities.TileEntity; import io.anuke.mindustry.entities.TileEntity;
import io.anuke.mindustry.game.EventType.TileChangeEvent; import io.anuke.mindustry.game.EventType.TileChangeEvent;
@@ -14,7 +13,10 @@ import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockFlag; import io.anuke.mindustry.world.meta.BlockFlag;
import io.anuke.ucore.core.Events; import io.anuke.ucore.core.Events;
import io.anuke.ucore.function.Predicate; import io.anuke.ucore.function.Predicate;
import io.anuke.ucore.util.*; import io.anuke.ucore.util.EnumSet;
import io.anuke.ucore.util.Geometry;
import io.anuke.ucore.util.Mathf;
import io.anuke.ucore.util.ThreadArray;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -80,7 +82,7 @@ public class BlockIndexer{
for(int x = 0; x < world.width(); x++){ for(int x = 0; x < world.width(); x++){
for(int y = 0; y < world.height(); y++){ for(int y = 0; y < world.height(); y++){
Tile tile = world.tileWorld(x, y); Tile tile = world.tile(x, y);
process(tile); process(tile);

2
core/src/io/anuke/mindustry/entities/effect/Puddle.java
View File

@@ -77,6 +77,8 @@ public class Puddle extends SolidEntity implements SaveTrait, Poolable, DrawTrai
} }
private static void deposit(Tile tile, Tile source, Liquid liquid, float amount, int generation){ private static void deposit(Tile tile, Tile source, Liquid liquid, float amount, int generation){
if(tile == null) return;
if(tile.floor().isLiquid && !canStayOn(liquid, tile.floor().liquidDrop)){ if(tile.floor().isLiquid && !canStayOn(liquid, tile.floor().liquidDrop)){
reactPuddle(tile.floor().liquidDrop, liquid, amount, tile, reactPuddle(tile.floor().liquidDrop, liquid, amount, tile,
(tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f); (tile.worldx() + source.worldx()) / 2f, (tile.worldy() + source.worldy()) / 2f);

1
core/src/io/anuke/mindustry/maps/Sectors.java
View File

@@ -112,7 +112,6 @@ public class Sectors{
for(GridPoint2 g : Geometry.d4){ for(GridPoint2 g : Geometry.d4){
createSector(x + g.x, y + g.y); createSector(x + g.x, y + g.y);
Sector other = grid.get(x + g.x, y + g.y);
} }
} }