3.5.2
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
package sh.okx.rankup.requirements;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.bukkit.entity.Player;
|
||||
import sh.okx.rankup.Rankup;
|
||||
|
||||
@@ -29,6 +28,7 @@ public abstract class Requirement implements Cloneable {
|
||||
this.name = clone.name;
|
||||
this.value = clone.value;
|
||||
this.sub = clone.sub;
|
||||
this.subRequirement = clone.subRequirement;
|
||||
}
|
||||
|
||||
public void setValue(String value) {
|
||||
@@ -57,6 +57,13 @@ public abstract class Requirement implements Cloneable {
|
||||
return Integer.parseInt(value);
|
||||
}
|
||||
|
||||
public String getFullName() {
|
||||
if (hasSubRequirement()) {
|
||||
return name + "#" + sub;
|
||||
} else {
|
||||
return name;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if a player meets this requirement
|
||||
|
||||
@@ -23,7 +23,7 @@ public class BlockBreakRequirement extends ProgressiveRequirement {
|
||||
|
||||
@Override
|
||||
public double getProgress(Player player) {
|
||||
return player.getStatistic(Statistic.MINE_BLOCK, Material.matchMaterial(getValueString()));
|
||||
return player.getStatistic(Statistic.MINE_BLOCK, Material.matchMaterial(getSub()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -18,7 +18,7 @@ public class MobKillsRequirement extends ProgressiveRequirement {
|
||||
|
||||
@Override
|
||||
public double getProgress(Player player) {
|
||||
return player.getStatistic(Statistic.KILL_ENTITY, EntityType.fromName(getValueString()));
|
||||
return player.getStatistic(Statistic.KILL_ENTITY, EntityType.fromName(getSub()));
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in New Issue
Block a user