Other: fixed rare NPE error on wrong connection, fixed formal param in Aminatou, the Fateshifter;

This commit is contained in:
Oleg Agafonov 2021-08-21 11:19:34 +04:00
parent 33380f09c2
commit 07d0e590a9
2 changed files with 3 additions and 4 deletions

View file

@ -518,7 +518,7 @@ public class SessionImpl implements Session {
}
try {
if (callbackClient.isConnected()) {
if (callbackClient != null && callbackClient.isConnected()) {
callbackClient.removeListener(callbackHandler);
callbackClient.disconnect();
}

View file

@ -30,7 +30,6 @@ import mage.target.targetpointer.FixedTarget;
import java.util.UUID;
/**
*
* @author Colin Redman
*/
public class AminatouTheFateshifter extends CardImpl {
@ -53,9 +52,9 @@ public class AminatouTheFateshifter extends CardImpl {
Ability ability = new LoyaltyAbility(new AminatouPlusEffect(), +1);
this.addAbility(ability);
// -1: Exile another target permanent you own, then return it to the battlefield under your control.
// 1: Exile another target permanent you own, then return it to the battlefield under your control.
ability = new LoyaltyAbility(new ExileTargetForSourceEffect(), -1);
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true));
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(false));
ability.addTarget(new TargetPermanent(filter));
this.addAbility(ability);