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

Merge pull request #5351 from magefree/plane-and-emblem-implements-controllable

Browse source 
Refactor: make plane and emblem implement Controllable
This commit is contained in:
Oleg Agafonov 2018-11-04 23:38:54 +04:00 • committed by GitHub
commit 08e88b8a65
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2600,7 +2600,7 @@ public abstract class GameImpl implements Game, Serializable {
boolean addPlaneAgain = false;
for (Iterator<CommandObject> it = this.getState().getCommand().iterator(); it.hasNext();) {
CommandObject obj = it.next();
if (obj.getControllerId().equals(playerId)) {
if (obj.isControlledBy(playerId)) {
if (obj instanceof Emblem) {
((Emblem) obj).discardEffects();// This may not be the best fix but it works
}