Allow negative points for flags and control points

Signed-off-by: Ruediger <[email protected]>
PGMDev · May 19, 2021 · 5bfbfb4 · 5bfbfb4
1 parent d5aac56
commit 5bfbfb4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/core/src/main/java/tc/oc/pgm/controlpoint/ControlPointDefinition.java b/core/src/main/java/tc/oc/pgm/controlpoint/ControlPointDefinition.java
@@ -218,7 +218,7 @@ public boolean isPermanent() {
   }
 
   public boolean affectsScore() {
-    return this.pointsPerSecond > 0;
+    return this.pointsPerSecond != 0;
   }
 
   public float getPointsPerSecond() {

diff --git a/core/src/main/java/tc/oc/pgm/flag/state/Carried.java b/core/src/main/java/tc/oc/pgm/flag/state/Carried.java
@@ -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);

diff --git a/core/src/main/java/tc/oc/pgm/flag/state/Returned.java b/core/src/main/java/tc/oc/pgm/flag/state/Returned.java
@@ -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);