Upstream
/
DungeonsXL
mirror of https://github.com/DRE2N/DungeonsXL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix level fee requirement; resolves #1048

This commit is contained in:
Daniel Saukel 2021-08-14 18:34:11 +02:00
parent f23b37f0cf
commit 25db2e71d2
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
core/src/main/java/de/erethon/dungeonsxl/requirement/FeeLevelRequirement.java
View File

@ -20,7 +20,6 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
import de.erethon.dungeonsxl.api.Requirement;
import de.erethon.dungeonsxl.api.dungeon.Game;
import de.erethon.dungeonsxl.api.dungeon.GameRule;
import de.erethon.dungeonsxl.api.dungeon.GameRuleContainer;
import de.erethon.dungeonsxl.config.DMessage;
import de.erethon.dungeonsxl.player.DGamePlayer;
import de.erethon.dungeonsxl.player.DGlobalPlayer;
@ -40,7 +39,6 @@ public class FeeLevelRequirement implements Requirement {
private DungeonsAPI api;
private int fee;
private Boolean keepInventory;
public FeeLevelRequirement(DungeonsAPI api) {
this.api = api;
@ -93,38 +91,28 @@ public class FeeLevelRequirement implements Requirement {
@Override
public void demand(Player player) {
DGamePlayer dPlayer = (DGamePlayer) api.getPlayerCache().getGamePlayer(player);
if (dPlayer == null) {
return;
}
DPlayerData data = dPlayer.getData();
data.setOldLevel(data.getOldLevel() - fee);
data.getConfig().set(DPlayerData.PREFIX_STATE_PERSISTENCE + "oldLvl", data.getOldLevel());
data.save();
if (isKeepInventory(player)) {
player.setLevel(player.getLevel() - fee);
} else {
DGamePlayer dPlayer = (DGamePlayer) api.getPlayerCache().getGamePlayer(player);
if (dPlayer == null) {
return;
}
DPlayerData data = dPlayer.getData();
data.setOldLevel(data.getOldLevel() - fee);
}
MessageUtil.sendMessage(player, DMessage.REQUIREMENT_FEE.getMessage(fee + " levels"));
}
private boolean isKeepInventory(Player player) {
if (keepInventory != null) {
return keepInventory;
}
Game game = api.getGame(player);
GameRuleContainer rules = null;
if (game != null) {
rules = game.getRules();
return game.getRules().getState(GameRule.KEEP_INVENTORY_ON_ENTER);
}
if (rules != null) {
keepInventory = rules.getState(GameRule.KEEP_INVENTORY_ON_ENTER);
return keepInventory;
}
keepInventory = GameRuleContainer.DEFAULT_VALUES.getState(GameRule.KEEP_INVENTORY_ON_ENTER);
return keepInventory;
return true;
}
@Override

1
core/src/main/java/de/erethon/dungeonsxl/requirement/FinishedDungeonsRequirement.java
View File

@ -20,7 +20,6 @@ import de.erethon.dungeonsxl.api.DungeonsAPI;
import de.erethon.dungeonsxl.api.Requirement;
import de.erethon.dungeonsxl.config.DMessage;
import de.erethon.dungeonsxl.player.DGlobalPlayer;
import de.erethon.dungeonsxl.player.DPermission;
import de.erethon.dungeonsxl.player.DPlayerData;
import de.erethon.dungeonsxl.util.commons.misc.NumberUtil;
import de.erethon.dungeonsxl.util.commons.misc.SimpleDateUtil;