github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 11:09:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

add null check

Browse source
This commit is contained in:
Ingmar Goudt 2019-01-11 01:04:34 +01:00
parent d7e68cf932
commit d5003a6f8f
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage/src/main/java/mage/abilities/effects/common/CipherEffect.java
View file

@ -115,7 +115,7 @@ class CipherStoreEffect extends OneShotEffect {
public boolean apply(Game game, Ability source) {
Player controller = game.getPlayer(source.getControllerId());
Card cipherCard = game.getCard(cipherCardId);
if (cipherCard != null) {
if (cipherCard != null && controller != null) {
Card copyCard = game.copyCard(cipherCard, source, controller.getId());
SpellAbility ability = copyCard.getSpellAbility();
// remove the cipher effect from the copy

2
Mage/src/main/java/mage/game/permanent/PermanentImpl.java
View file

@ -43,7 +43,7 @@ public abstract class PermanentImpl extends CardImpl implements Permanent {
private static final Logger logger = Logger.getLogger(PermanentImpl.class);
public class MarkedDamageInfo {
static class MarkedDamageInfo {
public MarkedDamageInfo(Counter counter, MageObject sourceObject) {
this.counter = counter;