External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-25 21:12:04 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6502 from SpeedProg/angel_of_serenity_mp_fix

Browse source 
Multiplayer test and fix for Angel of Serenity leaves battlefied trig…
This commit is contained in:
Oleg Agafonov 2020-05-03 19:56:21 +02:00 • committed by GitHub
commit f3990caf22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 73 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Mage/src/main/java/mage/game/GameImpl.java
View file

@ -2581,6 +2581,9 @@ public abstract class GameImpl implements Game, Serializable {
}
}
}
for(Card card : toOutside) {
rememberLKI(card.getId(), Zone.BATTLEFIELD, card);
}
// needed to send event that permanent leaves the battlefield to allow non stack effects to execute
player.moveCards(toOutside, Zone.OUTSIDE, null, this);
// triggered abilities that don't use the stack have to be executed

2
Mage/src/main/java/mage/players/PlayerImpl.java
View file

@ -3987,7 +3987,7 @@ public abstract class PlayerImpl implements Player, Serializable {
for (Card card : cards) {
if (card instanceof Permanent) {
game.getBattlefield().removePermanent(card.getId());
ZoneChangeEvent event = new ZoneChangeEvent(card.getId(),
ZoneChangeEvent event = new ZoneChangeEvent((Permanent)card,
(source == null ? null : source.getSourceId()),
byOwner ? card.getOwnerId() : getId(), Zone.BATTLEFIELD, Zone.OUTSIDE, appliedEffects);
game.fireEvent(event);