diff --git a/POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/planner/PlannedAction.java b/POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/planner/PlannedAction.java index 81e86440e..85b1cce23 100644 --- a/POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/planner/PlannedAction.java +++ b/POSEIDON/src/main/java/uk/ac/ox/oxfish/fisher/purseseiner/planner/PlannedAction.java @@ -81,17 +81,9 @@ public double hoursItTake() { @Override public Action[] actuate(final Fisher fisher) { - if (isAllowedNow(fisher)) { - return delayInHours <= 0 - ? new Action[]{new FadDeploymentAction(fisher)} - : new Action[]{new FadDeploymentAction(fisher), new Delaying(delayInHours)}; - } else { - // Sometimes a deployment that we planned for is not allowed anymore - // when we actually get to it. If that's the case, we just don't take - // the action. There should be a smarter way to do this but we are, - // again, just patching things up before a deadline. - return new Action[]{}; - } + return delayInHours <= 0 + ? new Action[]{new FadDeploymentAction(fisher)} + : new Action[]{new FadDeploymentAction(fisher), new Delaying(delayInHours)}; } @Override