Commit 001a51a0 authored by Michael Kamensky's avatar Michael Kamensky

Merge branch 'master' into 'master'

Fix for Quest Reward Multiplier Issue

See merge request core-developers/forge!820
parents ac4d476a e2e0123d
......@@ -226,9 +226,9 @@ public class QuestWinLoseController {
sb.append(StringUtils.capitalize(qEvent.getDifficulty().getTitle()));
sb.append(" opponent: ").append(credBase).append(" credits.\n");
int multiplayer = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX));
final int winMultiplier = Math.min(qData.getAchievements().getWin(), FModel.getQuestPreferences().getPrefInt(QPref.REWARDS_WINS_MULTIPLIER_MAX));
final int creditsForPreviousWins = (int) ((Double.parseDouble(FModel.getQuestPreferences()
.getPref(QPref.REWARDS_WINS_MULTIPLIER)) * multiplier));
.getPref(QPref.REWARDS_WINS_MULTIPLIER)) * winMultiplier));
credBase += creditsForPreviousWins;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment