diff --git a/forge-core/src/main/java/forge/deck/DeckFormat.java b/forge-core/src/main/java/forge/deck/DeckFormat.java index 131b4360e42..23ffa77fbe5 100644 --- a/forge-core/src/main/java/forge/deck/DeckFormat.java +++ b/forge-core/src/main/java/forge/deck/DeckFormat.java @@ -473,6 +473,10 @@ public enum DeckFormat { if (paperCardPoolFilter != null) { for (final Entry cp : deck.getAllCardsInASinglePool()) { if (!paperCardPoolFilter.apply(cp.getKey())) { + System.err.println( + "Excluding deck: '" + deck.toString() + + "' Reason: '" + cp.getKey() + "' is not legal." + ); return false; } } diff --git a/forge-gui/res/cardsfolder/r/risk_factor.txt b/forge-gui/res/cardsfolder/r/risk_factor.txt index 638057ce960..6451e0530c0 100644 --- a/forge-gui/res/cardsfolder/r/risk_factor.txt +++ b/forge-gui/res/cardsfolder/r/risk_factor.txt @@ -2,6 +2,6 @@ Name:Risk Factor ManaCost:2 R Types:Instant K:Jump-start -A:SP$ Pump | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | UnlessCost$ DamageYou<4> | UnlessPayer$ Targeted | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBDraw | SpellDescription$ Target opponent may have CARDNAME deal 4 damage to them. If that player doesn't, you draw three cards. +A:SP$ Pump | StackDescription$ {p:Targeted} may have CARDNAME deal 4 damage to them. If {p:Targeted} doesn't, | Cost$ 2 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | UnlessCost$ DamageYou<4> | UnlessPayer$ Targeted | UnlessResolveSubs$ WhenNotPaid | SubAbility$ DBDraw | SpellDescription$ Target opponent may have CARDNAME deal 4 damage to them. If that player doesn't, you draw three cards. SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 3 Oracle:Target opponent may have Risk Factor deal 4 damage to them. If that player doesn't, you draw three cards.\nJump-start (You may cast this card from your graveyard by discarding a card in addition to paying its other costs. Then exile this card.) diff --git a/forge-gui/src/main/java/forge/net/ProtocolMethod.java b/forge-gui/src/main/java/forge/net/ProtocolMethod.java index 3035d5a3202..11ff02380d9 100644 --- a/forge-gui/src/main/java/forge/net/ProtocolMethod.java +++ b/forge-gui/src/main/java/forge/net/ProtocolMethod.java @@ -3,6 +3,7 @@ package forge.net; import java.io.Serializable; import java.lang.reflect.Method; import java.util.Collection; +import java.util.ConcurrentModificationException; import java.util.List; import java.util.Map; @@ -166,6 +167,9 @@ public enum ProtocolMethod { // not sure why this one would be thrown, but it is // it also doesn't prevent things from working, so, log for now, pending full network rewrite ex.printStackTrace(); + } catch(ConcurrentModificationException ex) { + // can't seem to avoid this from periodically happening + ex.printStackTrace(); } } }