mirror of
https://github.com/DRE2N/DungeonsXL.git
synced 2024-09-18 19:11:09 +02:00
Game types without rewards now don't give rewards anymore
This commit is contained in:
parent
f4a572ba69
commit
23f6f4bfd6
@ -19,6 +19,8 @@ package io.github.dre2n.dungeonsxl.world.block;
|
|||||||
import io.github.dre2n.commons.util.messageutil.MessageUtil;
|
import io.github.dre2n.commons.util.messageutil.MessageUtil;
|
||||||
import io.github.dre2n.dungeonsxl.DungeonsXL;
|
import io.github.dre2n.dungeonsxl.DungeonsXL;
|
||||||
import io.github.dre2n.dungeonsxl.config.DMessages;
|
import io.github.dre2n.dungeonsxl.config.DMessages;
|
||||||
|
import io.github.dre2n.dungeonsxl.game.Game;
|
||||||
|
import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
|
||||||
import io.github.dre2n.dungeonsxl.player.DGamePlayer;
|
import io.github.dre2n.dungeonsxl.player.DGamePlayer;
|
||||||
import io.github.dre2n.dungeonsxl.player.DGroup;
|
import io.github.dre2n.dungeonsxl.player.DGroup;
|
||||||
import io.github.dre2n.dungeonsxl.reward.ItemReward;
|
import io.github.dre2n.dungeonsxl.reward.ItemReward;
|
||||||
@ -169,22 +171,25 @@ public class RewardChest extends GameBlock {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!hasMoneyReward) {
|
Game game = Game.getByDGroup(dGroup);
|
||||||
Reward reward = Reward.create(RewardTypeDefault.MONEY);
|
if (game == null || game.getType() == GameTypeDefault.CUSTOM || game.getType().hasRewards()) {
|
||||||
((MoneyReward) reward).addMoney(moneyReward);
|
if (!hasMoneyReward) {
|
||||||
dGroup.addReward(reward);
|
Reward reward = Reward.create(RewardTypeDefault.MONEY);
|
||||||
}
|
((MoneyReward) reward).addMoney(moneyReward);
|
||||||
|
dGroup.addReward(reward);
|
||||||
|
}
|
||||||
|
|
||||||
if (!hasLevelReward) {
|
if (!hasLevelReward) {
|
||||||
Reward reward = Reward.create(RewardTypeDefault.LEVEL);
|
Reward reward = Reward.create(RewardTypeDefault.LEVEL);
|
||||||
((LevelReward) reward).addLevels(levelReward);
|
((LevelReward) reward).addLevels(levelReward);
|
||||||
dGroup.addReward(reward);
|
dGroup.addReward(reward);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!hasItemReward) {
|
if (!hasItemReward) {
|
||||||
Reward reward = Reward.create(RewardTypeDefault.ITEM);
|
Reward reward = Reward.create(RewardTypeDefault.ITEM);
|
||||||
((ItemReward) reward).addItems(itemReward);
|
((ItemReward) reward).addItems(itemReward);
|
||||||
dGroup.addReward(reward);
|
dGroup.addReward(reward);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (Player player : dGroup.getPlayers()) {
|
for (Player player : dGroup.getPlayers()) {
|
||||||
|
Loading…
Reference in New Issue
Block a user