diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/views/VDev.java b/forge-gui-desktop/src/main/java/forge/screens/match/views/VDev.java index 6c313c12edc..323c0e5c26f 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/views/VDev.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/views/VDev.java @@ -94,12 +94,12 @@ public class VDev implements IVDoc, IDevListener { viewport.add(this.lblTutor, halfConstraints); viewport.add(this.lblViewAll, halfConstraintsLeft); viewport.add(this.lblUnlimitedLands, halfConstraints); - viewport.add(this.lblCardToHand, halfConstraintsLeft); - viewport.add(this.lblCardToBattlefield, halfConstraints); + viewport.add(this.lblCastSpell, halfConstraintsLeft); + viewport.add(this.lblCardToHand, halfConstraints); viewport.add(this.lblCardToLibrary, halfConstraintsLeft); viewport.add(this.lblCardToGraveyard, halfConstraints); viewport.add(this.lblCardToExile, halfConstraintsLeft); - viewport.add(this.lblCastSpell, halfConstraints); + viewport.add(this.lblCardToBattlefield, halfConstraints); viewport.add(this.lblRemoveFromGame, halfConstraintsLeft); viewport.add(this.lblRepeatAddCard, halfConstraints); viewport.add(this.lblExileFromHand, halfConstraintsLeft); diff --git a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java index d148c7e33c7..9b5fa1d8618 100644 --- a/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java +++ b/forge-gui/src/main/java/forge/player/PlayerControllerHuman.java @@ -2168,10 +2168,10 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont game.getAction().moveTo(targetZone, forgeCard, null); } else { if (noTriggers) { - if (forgeCard.isPermanent()) { + if (forgeCard.isPermanent() && !forgeCard.isAura()) { game.getAction().moveTo(targetZone, forgeCard, null); } else { - getGui().message("The chosen card is not a permanent.\nIf you'd like to cast a non-permanent spell, or if you'd like to cast a permanent spell (and place it on stack), please use the Cast Spell/Play Land button.", "Error"); + getGui().message("The chosen card is not a permanent or can't exist independently on the battlefield.\nIf you'd like to cast a non-permanent spell, or if you'd like to cast a permanent spell and place it on stack, please use the Cast Spell/Play Land button.", "Error"); return; } } else {