This commit is contained in:
okx-code
2021-06-26 19:35:47 +01:00
parent 59e97d3f61
commit 9b37409479
3 changed files with 9 additions and 13 deletions
@@ -1,5 +1,7 @@
package sh.okx.rankup.commands;
import java.util.Map;
import java.util.WeakHashMap;
import lombok.RequiredArgsConstructor;
import org.bukkit.ChatColor;
import org.bukkit.command.Command;
@@ -14,9 +16,6 @@ import sh.okx.rankup.ranks.Rank;
import sh.okx.rankup.ranks.RankElement;
import sh.okx.rankup.ranks.Rankups;
import java.util.Map;
import java.util.WeakHashMap;
@RequiredArgsConstructor
public class RankupCommand implements CommandExecutor {
// weak hash maps so players going offline are automatically removed.
@@ -49,7 +48,7 @@ public class RankupCommand implements CommandExecutor {
// clicking on the gui cannot confirm a rankup
if (confirmationType.equals("text") && confirming.containsKey(player) && !(args.length > 0 && args[0].equalsIgnoreCase("gui"))) {
long time = System.currentTimeMillis() - confirming.remove(player);
if (time < config.getInt("text.timeout") * 1000) {
if (time < config.getInt("text.timeout") * 1000L) {
plugin.getHelper().rankup(player);
return true;
}
@@ -22,12 +22,8 @@ public abstract class ProgressiveRequirement extends Requirement {
}
@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 double getRemaining(Player player) {
return Math.max(0, getTotal(player) - getProgress(player));
}
@Override