mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-20 12:48:00 +00:00
- Moved some combat code around (check for blocker triggers should only happen once now).
- Equipment should get removed now whenever something is grabbed with Control Magic and other cards.
This commit is contained in:
@@ -4787,6 +4787,8 @@ public class CardFactory implements NewConstants {
|
||||
PlayerZone from = AllZone.getZone(c);
|
||||
PlayerZone to = AllZone.getZone(Constant.Zone.Play, card.getController());
|
||||
|
||||
CardFactoryUtil.checkEquipmentOnControllerChange(from, to, c);
|
||||
|
||||
from.remove(c);
|
||||
to.add(c);
|
||||
|
||||
@@ -6353,6 +6355,7 @@ public class CardFactory implements NewConstants {
|
||||
|
||||
//moveTo() makes a new card, so you don't have to remove "Haste"
|
||||
//AllZone.GameAction.moveTo(playEOT[0], target[0]);
|
||||
|
||||
temp[0].remove(target[0]);
|
||||
orig[0].add(target[0]);
|
||||
target[0].untap();
|
||||
@@ -6385,6 +6388,8 @@ public class CardFactory implements NewConstants {
|
||||
temp[0] = play;
|
||||
orig[0].remove(getTargetCard());
|
||||
|
||||
CardFactoryUtil.checkEquipmentOnControllerChange(orig[0], temp[0], getTargetCard());
|
||||
|
||||
((PlayerZone_ComesIntoPlay) AllZone.Human_Play).setTriggers(true);
|
||||
((PlayerZone_ComesIntoPlay) AllZone.Computer_Play).setTriggers(true);
|
||||
|
||||
@@ -16101,6 +16106,7 @@ public class CardFactory implements NewConstants {
|
||||
|
||||
PlayerZone to = AllZone.getZone(Constant.Zone.Play,
|
||||
AllZone.GameAction.getOpponent(card.getController()));
|
||||
CardFactoryUtil.checkEquipmentOnControllerChange(from, to, c);
|
||||
to.add(c);
|
||||
|
||||
((PlayerZone_ComesIntoPlay) AllZone.Human_Play).setTriggers(true);
|
||||
|
||||
Reference in New Issue
Block a user