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

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

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mage.Common/src/main/java/mage/remote/SessionImpl.java
View file

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

5
Mage.Sets/src/mage/cards/a/AminatouTheFateshifter.java
View file

@ -30,7 +30,6 @@ import mage.target.targetpointer.FixedTarget;
import java.util.UUID; import java.util.UUID;
/** /**
*
* @author Colin Redman * @author Colin Redman
*/ */
public class AminatouTheFateshifter extends CardImpl { public class AminatouTheFateshifter extends CardImpl {
@ -53,9 +52,9 @@ public class AminatouTheFateshifter extends CardImpl {
Ability ability = new LoyaltyAbility(new AminatouPlusEffect(), +1); Ability ability = new LoyaltyAbility(new AminatouPlusEffect(), +1);
this.addAbility(ability); 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 = new LoyaltyAbility(new ExileTargetForSourceEffect(), -1);
ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(true)); ability.addEffect(new ReturnToBattlefieldUnderYourControlTargetEffect(false));
ability.addTarget(new TargetPermanent(filter)); ability.addTarget(new TargetPermanent(filter));
this.addAbility(ability); this.addAbility(ability);