From 74c310de3e45ed7581b2bd0517d41f63fa2204fe Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Wed, 6 Apr 2016 20:45:33 +0200 Subject: [PATCH] Fixed some more possible exception bugs. --- .../mage/server/record/TableRecorderImpl.java | 5 +-- .../mage/sets/ninthedition/StorageMatrix.java | 18 +++++---- .../sets/riseoftheeldrazi/SarkhanTheMad.java | 6 ++- Mage/src/main/java/mage/game/Table.java | 38 +++++++++---------- 4 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Mage.Server/src/main/java/mage/server/record/TableRecorderImpl.java b/Mage.Server/src/main/java/mage/server/record/TableRecorderImpl.java index 2bafdff9c1..5d65ffe7f8 100644 --- a/Mage.Server/src/main/java/mage/server/record/TableRecorderImpl.java +++ b/Mage.Server/src/main/java/mage/server/record/TableRecorderImpl.java @@ -4,17 +4,16 @@ import mage.game.Table; import mage.game.Table.TableRecorder; import mage.game.result.ResultProtos.TableProto; import mage.server.UserManager; -import org.apache.log4j.Logger; public class TableRecorderImpl implements TableRecorder { - private static TableRecorderImpl INSTANCE = new TableRecorderImpl(); - private static final Logger logger = Logger.getLogger(TableRecorderImpl.class); + private final static TableRecorderImpl INSTANCE = new TableRecorderImpl(); public static TableRecorderImpl getInstance() { return INSTANCE; } + @Override public void record(Table table) { TableProto proto = table.toProto(); TableRecordRepository.instance.add(new TableRecord(proto, proto.getEndTimeMs())); diff --git a/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java b/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java index 2256c8e78f..abaee3c333 100644 --- a/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java +++ b/Mage.Sets/src/mage/sets/ninthedition/StorageMatrix.java @@ -112,16 +112,18 @@ class StorageMatrixRestrictionEffect extends RestrictionEffect { } } String choosenType = choiceImpl.getChoice(); - game.informPlayers(storageMatrix.getLogName() + ": " + player.getLogName() + " chose to untap " + choosenType); + if (choosenType != null) { + game.informPlayers(storageMatrix.getLogName() + ": " + player.getLogName() + " chose to untap " + choosenType); - if (choosenType.equals(CardType.ARTIFACT.toString())) { - type = CardType.ARTIFACT; - } else if (choosenType.equals(CardType.LAND.toString())) { - type = CardType.LAND; - } else { - type = CardType.CREATURE; + if (choosenType.equals(CardType.ARTIFACT.toString())) { + type = CardType.ARTIFACT; + } else if (choosenType.equals(CardType.LAND.toString())) { + type = CardType.LAND; + } else { + type = CardType.CREATURE; + } + applies = true; } - applies = true; } } } diff --git a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java index f106c098c4..3e4743ccd4 100644 --- a/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java +++ b/Mage.Sets/src/mage/sets/riseoftheeldrazi/SarkhanTheMad.java @@ -108,8 +108,10 @@ class SarkhanTheMadRevealAndDrawEffect extends OneShotEffect { Card card = controller.getLibrary().getFromTop(game); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (card != null) { - controller.moveCards(card, null, Zone.HAND, source, game); - sourcePermanent.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, false); + controller.moveCards(card, Zone.HAND, source, game); + if (sourcePermanent != null) { + sourcePermanent.damage(card.getManaCost().convertedManaCost(), source.getSourceId(), game, false, false); + } controller.revealCards(sourceObject.getIdName(), new CardsImpl(card), game); } return true; diff --git a/Mage/src/main/java/mage/game/Table.java b/Mage/src/main/java/mage/game/Table.java index b6669a428e..1d2f2d0604 100644 --- a/Mage/src/main/java/mage/game/Table.java +++ b/Mage/src/main/java/mage/game/Table.java @@ -24,8 +24,7 @@ * The views and conclusions contained in the software and documentation are those of the * authors and should not be interpreted as representing official policies, either expressed * or implied, of BetaSteward_at_googlemail.com. -*/ - + */ package mage.game; import java.io.Serializable; @@ -65,7 +64,8 @@ public class Table implements Serializable { private TableRecorder recorder; public interface TableRecorder { - void record(Table table); + + void record(Table table); }; protected TableEventSource tableEventSource = new TableEventSource(); @@ -74,14 +74,14 @@ public class Table implements Serializable { this(roomId, gameType, name, controllerName, validator, playerTypes, recorder); this.tournament = tournament; this.isTournament = true; - setState(TableState.WAITING); + setState(TableState.WAITING); } public Table(UUID roomId, String gameType, String name, String controllerName, DeckValidator validator, List playerTypes, TableRecorder recorder, Match match) { this(roomId, gameType, name, controllerName, validator, playerTypes, recorder); this.match = match; - this.isTournament = false; - setState(TableState.WAITING); + this.isTournament = false; + setState(TableState.WAITING); } protected Table(UUID roomId, String gameType, String name, String controllerName, DeckValidator validator, List playerTypes, TableRecorder recorder) { @@ -100,7 +100,7 @@ public class Table implements Serializable { private void createSeats(List playerTypes) { int i = 0; seats = new Seat[numSeats]; - for(String playerType: playerTypes) { + for (String playerType : playerTypes) { seats[i] = new Seat(playerType); i++; } @@ -115,7 +115,7 @@ public class Table implements Serializable { } public void initGame() { - setState(TableState.DUELING); + setState(TableState.DUELING); } public void initTournament() { @@ -124,7 +124,7 @@ public class Table implements Serializable { } public void endTournament() { - setState(TableState.FINISHED); + setState(TableState.FINISHED); } public void initDraft() { @@ -138,8 +138,8 @@ public class Table implements Serializable { } /** - * All activities of the table end - * (only replay of games (if active) and display tournament results) + * All activities of the table end (only replay of games (if active) and + * display tournament results) * */ public void closeTable() { @@ -151,7 +151,7 @@ public class Table implements Serializable { /** * Complete remove of the table, release all objects - * + * */ public void cleanUp() { if (match != null) { @@ -190,7 +190,7 @@ public class Table implements Serializable { } private boolean isReady() { - for (int i = 0; i < numSeats; i++ ) { + for (int i = 0; i < numSeats; i++) { if (seats[i].getPlayer() == null) { return false; } @@ -207,7 +207,7 @@ public class Table implements Serializable { } public Seat getNextAvailableSeat(String playerType) { - for (int i = 0; i < numSeats; i++ ) { + for (int i = 0; i < numSeats; i++) { if (seats[i].getPlayer() == null && seats[i].getPlayerType().equals(playerType)) { return seats[i]; } @@ -216,7 +216,7 @@ public class Table implements Serializable { } public boolean allSeatsAreOccupied() { - for (int i = 0; i < numSeats; i++ ) { + for (int i = 0; i < numSeats; i++) { if (seats[i].getPlayer() == null) { return false; } @@ -225,7 +225,7 @@ public class Table implements Serializable { } public void leaveNotStartedTable(UUID playerId) { - for (int i = 0; i < numSeats; i++ ) { + for (int i = 0; i < numSeats; i++) { Player player = seats[i].getPlayer(); if (player != null && player.getId().equals(playerId)) { seats[i].setPlayer(null); @@ -296,15 +296,15 @@ public class Table implements Serializable { return tournament.getStartTime(); } else { return match.getStartTime(); - } + } } - + public Date getEndTime() { if (isTournament) { return tournament.getEndTime(); } else { return match.getEndTime(); - } + } } public TableProto toProto() {