diff --git a/Mage.Sets/src/mage/cards/r/RoccoCabarettiCaterer.java b/Mage.Sets/src/mage/cards/r/RoccoCabarettiCaterer.java index b83ec4c1004..bf434a1ae0d 100644 --- a/Mage.Sets/src/mage/cards/r/RoccoCabarettiCaterer.java +++ b/Mage.Sets/src/mage/cards/r/RoccoCabarettiCaterer.java @@ -44,11 +44,14 @@ public final class RoccoCabarettiCaterer extends CardImpl { // When Rocco, Cabaretti Caterer enters the battlefield, if you cast it, you may search your library for a creature card with mana value X or less, put it onto the battlefield, then shuffle. this.addAbility(new ConditionalInterveningIfTriggeredAbility( new EntersBattlefieldTriggeredAbility( - new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), true - ), CastFromEverywhereSourceCondition.instance, "When {this} enters the battlefield, " + + new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(filter)), + true + ), + CastFromEverywhereSourceCondition.instance, + "When {this} enters the battlefield, " + "if you cast it, you may search your library for a creature card with mana value X or less, " + - "put it onto the battlefield, then shuffle." - )); + "put it onto the battlefield, then shuffle.") + ); } private RoccoCabarettiCaterer(final RoccoCabarettiCaterer card) { @@ -66,6 +69,9 @@ enum RoccoCabarettiCatererPredicate implements ObjectSourcePlayerPredicate @Override public boolean apply(ObjectSourcePlayer input, Game game) { + if (input.getSource() == null) { + return false; + } return input.getObject().getManaValue() <= ManacostVariableValue.ETB.calculate(game, input.getSource(), null); }