Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Fixed different ZCC in split card's parts (flashback fix, see 95075cf33e);

Browse source 
Improve moveToZone code and fixed some cards with wrong commands queue (e.g. directly removes card from zone and then calls moveToZone again);
This commit is contained in:
Oleg Agafonov 2020-06-04 23:47:50 +04:00
parent f010454cb2
commit e95ae2675b
21 changed files with 116 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Mage/src/main/java/mage/cards/MeldCard.java
View file

@ -1,4 +1,3 @@
package mage.cards;
import mage.abilities.Ability;
@ -13,7 +12,6 @@ import java.util.List;
import java.util.UUID;
/**
*
* @author emerald000
*/
public abstract class MeldCard extends CardImpl {
@ -142,6 +140,24 @@ public abstract class MeldCard extends CardImpl {
return value;
}
@Override
public boolean moveToZone(Zone toZone, UUID sourceId, Game game, boolean flag, List<UUID> appliedEffects) {
// TODO: missing override method for meld cards? See removeFromZone, updateZoneChangeCounter, etc
return super.moveToZone(toZone, sourceId, game, flag, appliedEffects);
}
@Override
public void setZone(Zone zone, Game game) {
// TODO: missing override method for meld cards? See removeFromZone, updateZoneChangeCounter, etc
super.setZone(zone, game);
}
@Override
public boolean moveToExile(UUID exileId, String name, UUID sourceId, Game game, List<UUID> appliedEffects) {
// TODO: missing override method for meld cards? See removeFromZone, updateZoneChangeCounter, etc
return super.moveToExile(exileId, name, sourceId, game, appliedEffects);
}
@Override
public boolean removeFromZone(Game game, Zone fromZone, UUID sourceId) {
if (isCopy()) {
@ -170,7 +186,7 @@ public abstract class MeldCard extends CardImpl {
super.updateZoneChangeCounter(game, event);
return;
}
game.getState().updateZoneChangeCounter(objectId);
super.updateZoneChangeCounter(game, event);
if (topLastZoneChangeCounter == topHalfCard.getZoneChangeCounter(game)
&& halves.contains(topHalfCard.getId())) {
topHalfCard.updateZoneChangeCounter(game, event);