external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-18 19:58:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-npes' into 'master'

Browse Source 
Fix NPEs reported by Sentry

See merge request core-developers/forge!1034
This commit is contained in:
Michael Kamensky
2018-10-21 03:54:26 +00:00
parent 7e8899acb6 ff4622954f
commit c50edc2139
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-ai/src/main/java/forge/ai/ability/ChangeZoneAi.java
View File

@@ -251,6 +251,10 @@ public class ChangeZoneAi extends SpellAbilityAi {
if (ai.getGame().getPhaseHandler().getPhase().isAfter(PhaseType.COMBAT_DAMAGE)) {
return false;
}
if (ai.getGame().getCombat() == null) {
return false;
}
List<Card> attackers = ai.getGame().getCombat().getUnblockedAttackers();
boolean lowerCMC = false;
for (Card attacker : attackers) {

9
forge-game/src/main/java/forge/game/GameView.java
View File

@@ -1,9 +1,6 @@
package forge.game;
import java.util.List;
import com.google.common.collect.Iterables;
import forge.LobbyPlayer;
import forge.deck.Deck;
import forge.game.GameOutcome.AnteResult;
@@ -22,6 +19,8 @@ import forge.trackable.TrackableObject;
import forge.trackable.TrackableProperty;
import forge.util.collect.FCollectionView;
import java.util.List;
public class GameView extends TrackableObject {
private static final long serialVersionUID = 8522884512960961528L;
@@ -127,7 +126,9 @@ public class GameView extends TrackableObject {
void updateGameOver(final Game game) {
set(TrackableProperty.GameOver, game.isGameOver());
set(TrackableProperty.MatchOver, game.getMatch().isMatchOver());
set(TrackableProperty.WinningPlayerName, game.getOutcome().getWinningLobbyPlayer().getName());
if (game.getOutcome() != null && game.getOutcome().getWinningLobbyPlayer() != null) {
set(TrackableProperty.WinningPlayerName, game.getOutcome().getWinningLobbyPlayer().getName());
}
set(TrackableProperty.WinningTeam, game.getOutcome() == null ? -1 : game.getOutcome().getWinningTeam());
}