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

- Fixed possible NPE's in doPayment functions.

Browse Source
This commit is contained in:
Sloth
2013-06-19 16:58:38 +00:00
parent ade7bed52f
commit 24ee2cba60
8 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/forge/card/cost/CostExile.java
View File

@@ -453,7 +453,7 @@ public class CostExile extends CostPartWithList {
*/
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().exile(targetCard);
targetCard.getGame().getAction().exile(targetCard);
}
/* (non-Javadoc)

2
src/main/java/forge/card/cost/CostExileAndPay.java
View File

@@ -25,7 +25,7 @@ public class CostExileAndPay extends CostPartWithList {
*/
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().exile(targetCard);
targetCard.getGame().getAction().exile(targetCard);
}
/* (non-Javadoc)

2
src/main/java/forge/card/cost/CostExiledMoveToGrave.java
View File

@@ -153,7 +153,7 @@ public class CostExiledMoveToGrave extends CostPartWithList {
*/
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().moveToGraveyard(targetCard);
targetCard.getGame().getAction().moveToGraveyard(targetCard);
}
/* (non-Javadoc)

2
src/main/java/forge/card/cost/CostMill.java
View File

@@ -148,7 +148,7 @@ public class CostMill extends CostPartWithList {
*/
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().moveToGraveyard(targetCard);
targetCard.getGame().getAction().moveToGraveyard(targetCard);
}
/* (non-Javadoc)

2
src/main/java/forge/card/cost/CostPutCardToLib.java
View File

@@ -319,7 +319,7 @@ public class CostPutCardToLib extends CostPartWithList {
*/
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().moveToLibrary(targetCard, Integer.parseInt(getLibPos()));
targetCard.getGame().getAction().moveToLibrary(targetCard, Integer.parseInt(getLibPos()));
}
/* (non-Javadoc)

2
src/main/java/forge/card/cost/CostReturn.java
View File

@@ -186,7 +186,7 @@ public class CostReturn extends CostPartWithList {
*/
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().moveToHand(targetCard);
targetCard.getGame().getAction().moveToHand(targetCard);
}
/* (non-Javadoc)

2
src/main/java/forge/card/cost/CostReveal.java
View File

@@ -215,7 +215,7 @@ public class CostReveal extends CostPartWithList {
*/
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().reveal(Lists.newArrayList(targetCard), ability.getActivatingPlayer());
targetCard.getGame().getAction().reveal(Lists.newArrayList(targetCard), ability.getActivatingPlayer());
}

2
src/main/java/forge/card/cost/CostSacrifice.java
View File

@@ -175,7 +175,7 @@ public class CostSacrifice extends CostPartWithList {
@Override
protected void doPayment(SpellAbility ability, Card targetCard) {
ability.getActivatingPlayer().getGame().getAction().sacrifice(targetCard, ability);
targetCard.getGame().getAction().sacrifice(targetCard, ability);
}
/* (non-Javadoc)