From 7bab56e9102740645b1e8d46457ca438d9c2328c Mon Sep 17 00:00:00 2001 From: Evan Kranzler Date: Thu, 16 Nov 2017 10:31:11 -0500 Subject: [PATCH] fixed Hubris bouncing equipment (fixes #4167) --- Mage.Sets/src/mage/cards/h/Hubris.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Mage.Sets/src/mage/cards/h/Hubris.java b/Mage.Sets/src/mage/cards/h/Hubris.java index cb4cb55983..c8ce846378 100644 --- a/Mage.Sets/src/mage/cards/h/Hubris.java +++ b/Mage.Sets/src/mage/cards/h/Hubris.java @@ -99,7 +99,13 @@ class HubrisReturnEffect extends OneShotEffect { for (UUID targetId : targetPointer.getTargets(game, source)) { Permanent creature = game.getPermanent(targetId); if (creature != null) { - Cards cardsToHand = new CardsImpl(creature.getAttachments()); + Cards cardsToHand = new CardsImpl(); + for (UUID cardId : creature.getAttachments()) { + Permanent card = game.getPermanent(cardId); + if (card != null && card.hasSubtype(SubType.AURA, game)) { + cardsToHand.add(card); + } + } cardsToHand.add(creature); controller.moveCards(cardsToHand, Zone.HAND, source, game); }