Commit 91327b73 authored by Michael Kamensky's avatar Michael Kamensky

Merge branch 'controllerInWeirdZonesFix' into 'master'

Cards in graveyards (etc) are always controlled by their owners

See merge request core-developers/forge!1991
parents d9899636 b9cf836c
......@@ -2697,6 +2697,13 @@ public class Card extends GameEntity implements Comparable<Card> {
public final Player getController() {
if ((currentZone == null) || ((currentZone.getZoneType() != ZoneType.Battlefield) && (currentZone.getZoneType() != ZoneType.Stack))){
//only permanents and spells have controllers [108.4],
//so a card really only has a controller while it's on the stack or battlefield.
//everywhere else, just use the owner [108.4a].
return owner;
Entry<Long, Player> lastEntry = tempControllers.lastEntry();
if (lastEntry != null) {
final long lastTimestamp = lastEntry.getKey();
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment