Merge pull request #847 from clfer/feature/build-queue-improvement

Allow to replace previous build request in queue
2019-10-20 16:57:25 -04:00
parent 907f1e7dfd a238d7278f
commit b1d9be707d
2 changed files with 15 additions and 2 deletions
@@ -193,11 +193,16 @@ public interface BuilderTrait extends Entity, TeamTrait{

    /** Add another build requests to the queue, if it doesn't exist there yet. */
    default void addBuildRequest(BuildRequest place, boolean tail){
+        BuildRequest replace = null;
        for(BuildRequest request : buildQueue()){
            if(request.x == place.x && request.y == place.y){
-                return;
+                replace = request;
+                break;
            }
        }
+        if(replace != null){
+            buildQueue().remove(replace);
+        }
        Tile tile = world.tile(place.x, place.y);
        if(tile != null && tile.entity instanceof BuildEntity){
            place.progress = tile.<BuildEntity>entity().progress;