3.9.1

- patch placeholders - fix an error if you have setup ranks incorrectly
2020-09-23 17:20:55 +01:00
parent 598962592b
commit 2bb17a0b71
4 changed files with 179 additions and 172 deletions
@@ -1,34 +1,39 @@
-package sh.okx.rankup.requirements;
-
-import org.bukkit.entity.Player;
-import sh.okx.rankup.RankupPlugin;
-
-public abstract class ProgressiveRequirement extends Requirement {
-  public ProgressiveRequirement(RankupPlugin plugin, String name) {
-    super(plugin, name);
-  }
-
-  public ProgressiveRequirement(RankupPlugin plugin, String name, boolean subRequirement) {
-    super(plugin, name, subRequirement);
-  }
-
-  protected ProgressiveRequirement(Requirement clone) {
-    super(clone);
-  }
-
-  @Override
-  public boolean check(Player player) {
-    return getRemaining(player) <= 0;
-  }
-
-  @Override
-  public final double getRemaining(Player player) {
-    return getRemaining(player, 1);
-  }
-
-  public double getRemaining(Player player, double multiplier) {
-    return Math.max(0, (multiplier * getTotal(player)) - getProgress(player));
-  }
-
-  public abstract double getProgress(Player player);
-}
+package sh.okx.rankup.requirements;
+
+import org.bukkit.entity.Player;
+import sh.okx.rankup.RankupPlugin;
+
+public abstract class ProgressiveRequirement extends Requirement {
+  public ProgressiveRequirement(RankupPlugin plugin, String name) {
+    super(plugin, name);
+  }
+
+  public ProgressiveRequirement(RankupPlugin plugin, String name, boolean subRequirement) {
+    super(plugin, name, subRequirement);
+  }
+
+  protected ProgressiveRequirement(Requirement clone) {
+    super(clone);
+  }
+
+  @Override
+  public boolean check(Player player) {
+    return getRemaining(player) <= 0;
+  }
+
+  @Override
+  public final double getRemaining(Player player) {
+    return getRemaining(player, 1);
+  }
+
+  public double getRemaining(Player player, double multiplier) {
+    return Math.max(0, (multiplier * getTotal(player)) - getProgress(player));
+  }
+
+  @Override
+  public double getTotal(Player player) {
+    return getValueDouble();
+  }
+
+  public abstract double getProgress(Player player);
+}