3.5-beta.5

Update gradle wrapper
Fix current_prestige and next_prestige placeholders
This commit is contained in:
okx-code
2019-04-15 22:28:38 +01:00
parent 6ee799609c
commit e4ffa0425f
19 changed files with 76 additions and 47 deletions
@@ -9,7 +9,7 @@ import sh.okx.rankup.requirements.Requirement;
public class BlockBreakRequirement extends ProgressiveRequirement {
public BlockBreakRequirement(Rankup plugin) {
super(plugin, "block-break");
super(plugin, "block-break", true);
}
@Override
@@ -30,9 +30,4 @@ public class BlockBreakRequirement extends ProgressiveRequirement {
public Requirement clone() {
return new BlockBreakRequirement(this);
}
@Override
public boolean hasSubRequirement() {
return true;
}
}
@@ -9,7 +9,7 @@ import sh.okx.rankup.requirements.Requirement;
public class MobKillsRequirement extends ProgressiveRequirement {
public MobKillsRequirement(Rankup plugin) {
super(plugin, "mob-kills");
super(plugin, "mob-kills", true);
}
protected MobKillsRequirement(Requirement clone) {
@@ -25,9 +25,4 @@ public class MobKillsRequirement extends ProgressiveRequirement {
public Requirement clone() {
return new MobKillsRequirement(this);
}
@Override
public boolean hasSubRequirement() {
return true;
}
}
@@ -16,9 +16,9 @@ public class MoneyRequirement extends DeductibleRequirement {
}
@Override
public void apply(Player player) {
public void apply(Player player, double multiplier) {
Economy economy = plugin.getEconomy();
economy.withdrawPlayer(player, getValueDouble());
economy.withdrawPlayer(player, getValueDouble() * multiplier);
}
@Override
@@ -15,7 +15,11 @@ public class WorldRequirement extends Requirement {
@Override
public boolean check(Player player) {
return player.getWorld().getName().equalsIgnoreCase(getValueString());
String[] worlds = getValuesString();
for (String world : worlds) {
return player.getWorld().getName().equalsIgnoreCase(world);
}
return false;
}
@Override
@@ -15,8 +15,8 @@ public class XpLevelRequirement extends DeductibleRequirement {
}
@Override
public void apply(Player player) {
player.setLevel(player.getLevel() - getValueInt());
public void apply(Player player, double multiplier) {
player.setLevel(player.getLevel() - (int) Math.round(getValueInt() * multiplier));
}
@Override
@@ -7,7 +7,7 @@ import sh.okx.rankup.requirements.ProgressiveRequirement;
public class McMMOSkillRequirement extends ProgressiveRequirement {
public McMMOSkillRequirement(Rankup plugin) {
super(plugin, "mcmmo");
super(plugin, "mcmmo", true);
}
protected McMMOSkillRequirement(McMMOSkillRequirement clone) {
@@ -19,11 +19,6 @@ public class McMMOSkillRequirement extends ProgressiveRequirement {
return McMMOSkillUtil.getInstance().getSkillLevel(player, getValueString());
}
@Override
public boolean hasSubRequirement() {
return true;
}
@Override
public Requirement clone() {
return new McMMOSkillRequirement(this);