From 42b3b19a5740417ebc1be5912f6616a30b4361e5 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 2 May 2018 17:26:20 -0400
Subject: [PATCH] Fixed broken blocks not updating path

---
 .../io/anuke/mindustry/ai/BlockIndexer.java   |  2 +-
 .../src/io/anuke/mindustry/ai/Pathfinder.java | 25 +++++++++++++------
 .../io/anuke/mindustry/game/EventType.java    |  4 +++
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/core/src/io/anuke/mindustry/ai/BlockIndexer.java b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
index 84fe0d65c5..a7911cefad 100644
--- a/core/src/io/anuke/mindustry/ai/BlockIndexer.java
+++ b/core/src/io/anuke/mindustry/ai/BlockIndexer.java
@@ -6,8 +6,8 @@ import com.badlogic.gdx.utils.ObjectSet;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
 import io.anuke.mindustry.game.Team;
-import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.BlockFlag;
+import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.core.Events;
 import io.anuke.ucore.util.EnumSet;
 
diff --git a/core/src/io/anuke/mindustry/ai/Pathfinder.java b/core/src/io/anuke/mindustry/ai/Pathfinder.java
index 0d7ba24f9c..9108e25641 100644
--- a/core/src/io/anuke/mindustry/ai/Pathfinder.java
+++ b/core/src/io/anuke/mindustry/ai/Pathfinder.java
@@ -20,13 +20,22 @@ import static io.anuke.mindustry.Vars.state;
 import static io.anuke.mindustry.Vars.world;
 
 public class Pathfinder {
-    private long maxUpdate = TimeUtils.millisToNanos(5);
+    private long maxUpdate = TimeUtils.millisToNanos(4);
     private PathData[] paths;
     private IntArray blocked = new IntArray();
 
     public Pathfinder(){
         Events.on(WorldLoadEvent.class, this::clear);
-        Events.on(TileChangeEvent.class, this::update);
+        Events.on(TileChangeEvent.class, tile -> {
+
+            for(TeamData data : state.teams.getTeams()){
+                if(data.team != tile.getTeam() && paths[data.team.ordinal()].weights[tile.x][tile.y] >= Float.MAX_VALUE){
+                    update(tile, data.team);
+                }
+            }
+
+            update(tile, tile.getTeam());
+        });
     }
 
     public void update(){
@@ -68,21 +77,21 @@ public class Pathfinder {
 
     private boolean passable(Tile tile, Team team){
         return (tile.getWallID() == 0 && !(tile.floor().liquid && (tile.floor().damageTaken > 0 || tile.floor().drownTime > 0))) || (tile.breakable()
-        && tile.getTeam() != team);
+        && (tile.getTeam() != team || !tile.solid()));
     }
 
-    private void update(Tile tile){
-        if(paths[tile.getTeam().ordinal()] != null) {
-            PathData path = paths[tile.getTeam().ordinal()];
+    private void update(Tile tile, Team team){
+        if(paths[team.ordinal()] != null) {
+            PathData path = paths[team.ordinal()];
 
-            if(!passable(tile, tile.getTeam())){
+            if(!passable(tile, team)){
                 path.weights[tile.x][tile.y] = Float.MAX_VALUE;
             }
 
             path.search ++;
             path.frontier.clear();
 
-            ObjectSet<Tile> set = world.indexer().getEnemy(tile.getTeam(), BlockFlag.target);
+            ObjectSet<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;
diff --git a/core/src/io/anuke/mindustry/game/EventType.java b/core/src/io/anuke/mindustry/game/EventType.java
index 2459ec47bb..d8f1615b68 100644
--- a/core/src/io/anuke/mindustry/game/EventType.java
+++ b/core/src/io/anuke/mindustry/game/EventType.java
@@ -30,6 +30,10 @@ public class EventType {
         void handle(Tile tile);
     }
 
+    public interface TileRemoveEvent extends Event{
+        void handle(Tile tile, Team oldTeam);
+    }
+
     public interface StateChangeEvent extends Event{
         void handle(State from, State to);
     }