Upstream/DungeonsXL
1
0
Fork 0
mirror of https://github.com/DRE2N/DungeonsXL.git synced 2024-09-16 01:57:14 +02:00
Code Issues Projects Releases Wiki Activity

Game types without rewards now don't give rewards anymore

Browse Source
This commit is contained in:
Daniel Saukel 2016-12-27 00:54:44 +01:00
parent f4a572ba69
commit 23f6f4bfd6
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
core/src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java
View File

@ -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()) {