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

Merge branch 'bug-fixes' into 'master'

Browse Source 
a few fixups

See merge request core-developers/forge!995
This commit is contained in:
Sol
2018-10-09 01:11:33 +00:00
parent 6d3c53c5dc d840cde96a
commit a43ef9944f
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-core/src/main/java/forge/deck/DeckFormat.java
View File

@@ -473,6 +473,10 @@ public enum DeckFormat {
if (paperCardPoolFilter != null) { if (paperCardPoolFilter != null) {
for (final Entry<PaperCard, Integer> cp : deck.getAllCardsInASinglePool()) { for (final Entry<PaperCard, Integer> cp : deck.getAllCardsInASinglePool()) {
if (!paperCardPoolFilter.apply(cp.getKey())) { if (!paperCardPoolFilter.apply(cp.getKey())) {
System.err.println(
"Excluding deck: '" + deck.toString() +
"' Reason: '" + cp.getKey() + "' is not legal."
);
return false; return false;
} }
} }

2
forge-gui/res/cardsfolder/r/risk_factor.txt
View File

@@ -2,6 +2,6 @@ Name:Risk Factor
ManaCost:2 R ManaCost:2 R
Types:Instant Types:Instant
K:Jump-start 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 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.) 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.)

4
forge-gui/src/main/java/forge/net/ProtocolMethod.java
View File

@@ -3,6 +3,7 @@ package forge.net;
import java.io.Serializable; import java.io.Serializable;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.Collection; import java.util.Collection;
import java.util.ConcurrentModificationException;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -166,6 +167,9 @@ public enum ProtocolMethod {
// not sure why this one would be thrown, but it is // 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 // it also doesn't prevent things from working, so, log for now, pending full network rewrite
ex.printStackTrace(); ex.printStackTrace();
} catch(ConcurrentModificationException ex) {
// can't seem to avoid this from periodically happening
ex.printStackTrace();
} }
} }
} }