From b04e13aa4befbcd7da714a92f61519e5ad4a9a62 Mon Sep 17 00:00:00 2001 From: magenoxx Date: Wed, 19 Apr 2017 11:48:10 +0300 Subject: [PATCH] Fixed NPE for loading tests where Option is null. getPriorityTime returns the same number --- Mage.Common/src/mage/view/TableView.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Mage.Common/src/mage/view/TableView.java b/Mage.Common/src/mage/view/TableView.java index 1d8b74e0416..00957ba1311 100644 --- a/Mage.Common/src/mage/view/TableView.java +++ b/Mage.Common/src/mage/view/TableView.java @@ -28,12 +28,6 @@ package mage.view; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.UUID; - import mage.constants.SkillLevel; import mage.constants.TableState; import mage.game.Game; @@ -43,6 +37,12 @@ import mage.game.draft.Draft; import mage.game.match.MatchPlayer; import mage.game.tournament.TournamentPlayer; +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.UUID; + /** * @author BetaSteward_at_googlemail.com */ @@ -123,7 +123,7 @@ public class TableView implements Serializable { StringBuilder addInfo = new StringBuilder(); if (table.getMatch().getGames().isEmpty()) { addInfo.append("Wins:").append(table.getMatch().getWinsNeeded()); - addInfo.append(" Time: ").append(table.getMatch().getOptions().getMatchTimeLimit().toString()); + addInfo.append(" Time: ").append(table.getMatch().getOptions().getPriorityTime()); if (table.getMatch().getFreeMulligans() > 0) { addInfo.append(" Free Mul.: ").append(table.getMatch().getFreeMulligans()); }