8000 Negative Points for Capture Points and Flags by RuedigerLP · Pull Request #869 · PGMDev/PGM · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Negative Points for Capture Points and Flags #869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
May 19, 2021
Merged

Negative Points for Capture Points and Flags #869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc8d806
Negative Points for Capture Points and Flags
RuedigerLP May 16, 2021
0d638ff
Revert "Negative Points for Capture Points and Flags"
RuedigerLP May 16, 2021
5344177
Revert "Revert "Negative Points for Capture Points and Flags""
RuedigerLP May 16, 2021
56b8658
Negative Points for Capture Points and Flags
RuedigerLP May 16, 2021
712f7dd
Negative Points for Capture Points and Flags
RuedigerLP May 16, 2021
d4cd750
Negative Points for Capture Points and Flags
RuedigerLP May 16, 2021
3cb28e7
Negative Points for Capture Points and Flags
RuedigerLP May 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8000
2 changes: 1 addition & 1 deletion core/src/main/java/tc/oc/pgm/controlpoint/ControlPointDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ public boolean isPermanent() {
}

public boolean affectsScore() {
return this.pointsPerSecond > 0;
return this.pointsPerSecond != 0;
}

public float getPointsPerSecond() {
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/tc/oc/pgm/flag/state/Carried.java
View file CC01
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public void tickRunning() {
}

ScoreMatchModule smm = this.flag.getMatch().getModule(ScoreMatchModule.class);
if (smm != null && this.flag.getDefinition().getPointsPerSecond() > 0) {
if (smm != null && this.flag.getDefinition().getPointsPerSecond() != 0) {
smm.incrementScore(
this.getBeneficiary(this.flag.getDefinition().getOwner()),
this.flag.getDefinition().getPointsPerSecond() / 20D);
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/tc/oc/pgm/flag/state/Returned.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public void tickRunning() {
super.tickRunning();

ScoreMatchModule smm = this.flag.getMatch().getModule(ScoreMatchModule.class);
if (smm != null && this.post.getOwner() != null && this.post.getPointsPerSecond() > 0) {
if (smm != null && this.post.getOwner() != null && this.post.getPointsPerSecond() != 0) {
smm.incrementScore(
this.flag.getMatch().needModule(TeamMatchModule.class).getTeam(this.post.getOwner()),
this.post.getPointsPerSecond() / 20D);
Expand Down
0