mirror of
https://github.com/correl/mage.git
synced 2024-11-15 19:19:33 +00:00
* Fixed possible null pointer exception.
This commit is contained in:
parent
3ba5d70d2f
commit
687fe91f49
1 changed files with 6 additions and 2 deletions
|
@ -138,7 +138,9 @@ public class PermanentCard extends PermanentImpl {
|
||||||
Card originalCard = game.getCard(this.getId());
|
Card originalCard = game.getCard(this.getId());
|
||||||
if (isFaceDown()) {
|
if (isFaceDown()) {
|
||||||
setFaceDown(false);
|
setFaceDown(false);
|
||||||
originalCard.setFaceDown(false); //TODO: Do this in a better way
|
if (originalCard != null) {
|
||||||
|
originalCard.setFaceDown(false); //TODO: Do this in a better way
|
||||||
|
}
|
||||||
}
|
}
|
||||||
ZoneChangeEvent event = new ZoneChangeEvent(this, sourceId, controllerId, fromZone, toZone, appliedEffects);
|
ZoneChangeEvent event = new ZoneChangeEvent(this, sourceId, controllerId, fromZone, toZone, appliedEffects);
|
||||||
if (!game.replaceEvent(event)) {
|
if (!game.replaceEvent(event)) {
|
||||||
|
@ -146,7 +148,9 @@ public class PermanentCard extends PermanentImpl {
|
||||||
game.rememberLKI(objectId, Zone.BATTLEFIELD, this);
|
game.rememberLKI(objectId, Zone.BATTLEFIELD, this);
|
||||||
if (owner != null) {
|
if (owner != null) {
|
||||||
this.setControllerId(ownerId); // neccessary for e.g. abilities in graveyard or hand to not have a controller != owner
|
this.setControllerId(ownerId); // neccessary for e.g. abilities in graveyard or hand to not have a controller != owner
|
||||||
originalCard.updateZoneChangeCounter();
|
if (originalCard != null) {
|
||||||
|
originalCard.updateZoneChangeCounter();
|
||||||
|
}
|
||||||
switch (event.getToZone()) {
|
switch (event.getToZone()) {
|
||||||
case GRAVEYARD:
|
case GRAVEYARD:
|
||||||
owner.putInGraveyard(card, game, !flag);
|
owner.putInGraveyard(card, game, !flag);
|
||||||
|
|
Loading…
Reference in a new issue