Actually fix friendly checkpoints
This commit is contained in:
parent
6b381897d7
commit
4cd978788a
|
@ -3,14 +3,9 @@ package tc.oc.pgm.filters.matcher.match;
|
||||||
import com.google.common.collect.Range;
|
import com.google.common.collect.Range;
|
||||||
import tc.oc.pgm.filters.matcher.TypedFilter;
|
import tc.oc.pgm.filters.matcher.TypedFilter;
|
||||||
import tc.oc.pgm.filters.query.IMatchQuery;
|
import tc.oc.pgm.filters.query.IMatchQuery;
|
||||||
import tc.oc.pgm.flag.FlagDefinition;
|
|
||||||
import tc.oc.pgm.flag.Post;
|
|
||||||
import tc.oc.pgm.flag.state.State;
|
|
||||||
import tc.oc.pgm.payload.Payload;
|
import tc.oc.pgm.payload.Payload;
|
||||||
import tc.oc.pgm.payload.PayloadDefinition;
|
import tc.oc.pgm.payload.PayloadDefinition;
|
||||||
|
|
||||||
import java.util.Optional;
|
|
||||||
|
|
||||||
public class PayloadEnemyCheckpointFilter extends TypedFilter.Impl<IMatchQuery> {
|
public class PayloadEnemyCheckpointFilter extends TypedFilter.Impl<IMatchQuery> {
|
||||||
|
|
||||||
private final @Inspect(brief=true) PayloadDefinition payload;
|
private final @Inspect(brief=true) PayloadDefinition payload;
|
||||||
|
|
|
@ -264,7 +264,7 @@ public class Payload extends OwnedGoal<PayloadDefinition> {
|
||||||
}
|
}
|
||||||
|
|
||||||
double speed = isInEnemyControl() ? this.definition.getEnemySpeed() : this.definition.getFriendlySpeed();
|
double speed = isInEnemyControl() ? this.definition.getEnemySpeed() : this.definition.getFriendlySpeed();
|
||||||
if (!isInEnemyControl() && this.currentPath.hasPrevious() && this.currentPath.previous().isCheckpoint() && !this.friendlyReachedCheckpoints.contains(this.currentPath)) {
|
if (!isInEnemyControl() && this.currentPath.hasPrevious() && this.currentPath.previous().isCheckpoint() && !this.friendlyReachedCheckpoints.contains(this.currentPath) && !this.definition.hasFriendlyCheckpoints()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue