External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-10 04:42:07 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Made a change to the event handling to get Undying to work.

Browse source
This commit is contained in:
LevelX2 2014-05-07 01:30:39 +02:00
parent 9364616517
commit 6b1e52d094
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Mage/src/mage/abilities/TriggeredAbilities.java
View file

@ -49,7 +49,7 @@ import mage.game.permanent.PermanentCard;
*/
public class TriggeredAbilities extends HashMap<String, TriggeredAbility> {
private Map<String, List<UUID>> sources = new HashMap<String, List<UUID>>();
private final Map<String, List<UUID>> sources = new HashMap<>();
public TriggeredAbilities() {}
@ -122,7 +122,7 @@ public class TriggeredAbilities extends HashMap<String, TriggeredAbility> {
*/
public void add(TriggeredAbility ability, UUID sourceId, MageObject attachedTo) {
this.add(ability, attachedTo);
List<UUID> uuidList = new LinkedList<UUID>();
List<UUID> uuidList = new LinkedList<>();
uuidList.add(sourceId);
// if the object that gained the ability moves zone, also then the triggered ability must be removed
uuidList.add(attachedTo.getId());
@ -145,9 +145,10 @@ public class TriggeredAbilities extends HashMap<String, TriggeredAbility> {
* Removes gained abilities by sourceId
*
* @param sourceId
* @return
*/
public List<String> removeGainedAbilitiesForSource(UUID sourceId) {
List<String> keysToRemove = new ArrayList<String>();
List<String> keysToRemove = new ArrayList<>();
for (Map.Entry<String, List<UUID>> entry : sources.entrySet()) {
if (entry.getValue().contains(sourceId)) {

1
Mage/src/mage/game/permanent/PermanentCard.java
View file

@ -163,6 +163,7 @@ public class PermanentCard extends PermanentImpl<PermanentCard> {
game.setZone(objectId, event.getToZone());
game.addSimultaneousEvent(event);
if (event.getFromZone().equals(Zone.BATTLEFIELD)) {
game.getState().handleSimultaneousEvent(game);
game.resetForSourceId(getId());
game.applyEffects(); // LevelX2: needed to execute isInactive for of custom duration copy effect if source returns directly (e.g. cloudshifted clone)
}