tale
/
ProjectAres
mirror of https://github.com/OvercastNetwork/ProjectAres.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Actually fix friendly checkpoints

This commit is contained in:
ShinyDialga 2017-12-31 00:05:59 -06:00
parent 6b381897d7
commit 4cd978788a
2 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
PGM/src/main/java/tc/oc/pgm/filters/matcher/match/PayloadEnemyCheckpointFilter.java
View File

@ -3,14 +3,9 @@ package tc.oc.pgm.filters.matcher.match;
import com.google.common.collect.Range;
import tc.oc.pgm.filters.matcher.TypedFilter;
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.PayloadDefinition;
import java.util.Optional;
public class PayloadEnemyCheckpointFilter extends TypedFilter.Impl<IMatchQuery> {
private final @Inspect(brief=true) PayloadDefinition payload;

2
PGM/src/main/java/tc/oc/pgm/payload/Payload.java
View File

@ -264,7 +264,7 @@ public class Payload extends OwnedGoal<PayloadDefinition> {
}
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;
}