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

- Quick fix for negative handsizes other than -1, which is used for no maximum (needs a non-hacky solution).

Browse Source
This commit is contained in:
Sloth
2012-11-12 09:18:16 +00:00
parent 0277607042
commit 6b463ec516
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/staticability/StaticAbilityContinuous.java
View File

@@ -282,7 +282,7 @@ public class StaticAbilityContinuous {
p.setMaxHandSize(max); p.setMaxHandSize(max);
} }
if (params.containsKey("RaiseMaxHandSize") && p.getMaxHandSize() >= 0) { if (params.containsKey("RaiseMaxHandSize") && p.getMaxHandSize() != -1) {
String rmhs = params.get("RaiseMaxHandSize"); String rmhs = params.get("RaiseMaxHandSize");
int rmax = rmhs.matches("[0-9][0-9]?") ? Integer.parseInt(rmhs) int rmax = rmhs.matches("[0-9][0-9]?") ? Integer.parseInt(rmhs)
: AbilityFactory.calculateAmount(hostCard, rmhs, null); : AbilityFactory.calculateAmount(hostCard, rmhs, null);

2
src/main/java/forge/control/input/InputCleanup.java
View File

@@ -50,7 +50,7 @@ public class InputCleanup extends Input {
final int n = active.getCardsIn(ZoneType.Hand).size(); final int n = active.getCardsIn(ZoneType.Hand).size();
final int max = active.getMaxHandSize(); final int max = active.getMaxHandSize();
// goes to the next phase // goes to the next phase
if (n <= max || max < 0) { if (n <= max || max == -1) {
Singletons.getModel().getGame().getPhaseHandler().passPriority(); Singletons.getModel().getGame().getPhaseHandler().passPriority();
return; return;
} }