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

*Fixed AF_NameCard crashing if the named card didn't exist or wasn't implemented. Now it will simply ask again. It is,sadly, still case sensitive.

Browse Source
This commit is contained in:
Hellfish
2011-10-21 08:49:44 +00:00
parent f275ce0e4b
commit bca99199e4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/forge/card/abilityFactory/AbilityFactory_Choose.java
View File

@@ -1286,11 +1286,16 @@ public class AbilityFactory_Choose {
String name = null; String name = null;
while (!ok) { while (!ok) {
if (sa.getActivatingPlayer().isHuman()) { if (sa.getActivatingPlayer().isHuman()) {
String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card"; String message = validDesc.equals("card") ? "Name a card" : "Name a " + validDesc + " card. (Case sensitive)";
name = JOptionPane.showInputDialog(null, message, host.getName(), JOptionPane.QUESTION_MESSAGE); name = JOptionPane.showInputDialog(null, message, host.getName(), JOptionPane.QUESTION_MESSAGE);
if (!valid.equals("Card") && !(null == name)) { if (!valid.equals("Card") && !(null == name)) {
try {
Card temp = AllZone.getCardFactory().getCard(name, p); Card temp = AllZone.getCardFactory().getCard(name, p);
ok = temp.isValid(valid, host.getController(), host); ok = temp.isValid(valid, host.getController(), host);
}
catch(Exception ignored) {
ok = false;
}
} }
else { else {
ok = true; ok = true;