External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-30 15:32:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge origin/master

Browse source
This commit is contained in:
LevelX2 2017-04-17 18:34:37 +02:00
commit cc6feacb2b
5 changed files with 79 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Mage.Sets/src/mage/cards/b/BontuTheGlorified.java
View file

@ -68,7 +68,7 @@ public class BontuTheGlorified extends CardImpl {
}
public BontuTheGlorified(UUID ownerId, CardSetInfo setInfo) {
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}");
super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{B}");
addSuperType(SuperType.LEGENDARY);
this.subtype.add("God");
this.power = new MageInt(4);

1
Mage.Sets/src/mage/cards/g/GontiLordOfLuxury.java
View file

@ -125,7 +125,6 @@ class GontiLordOfLuxuryEffect extends OneShotEffect {
card.setFaceDown(true, game);
if (controller.moveCardsToExile(card, source, game, false, exileZoneId, sourceObject.getIdName())) {
card.setFaceDown(true, game);
@SuppressWarnings("unchecked")
Set<UUID> exileZones = (Set<UUID>) game.getState().getValue(GontiLordOfLuxury.VALUE_PREFIX + source.getSourceId().toString());
if (exileZones == null) {
exileZones = new HashSet<>();

2
Mage.Sets/src/mage/cards/m/MagusOfTheMoon.java
View file

@ -53,7 +53,7 @@ public class MagusOfTheMoon extends CardImpl {
private static final FilterLandPermanent filter = new FilterLandPermanent();
static {
filter.add(Predicates.not(new SupertypePredicate(SuperType.LEGENDARY)));
filter.add(Predicates.not(new SupertypePredicate(SuperType.BASIC)));
}
public MagusOfTheMoon(UUID ownerId, CardSetInfo setInfo) {

6
Mage.Sets/src/mage/cards/t/TrespassersCurse.java
View file

@ -97,11 +97,11 @@ class TrespassersCurseTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkTrigger(GameEvent event, Game game) {
Permanent enchantment = game.getPermanent(this.getSourceId());
Permanent enchantment = game.getPermanent(this.sourceId);
if (enchantment != null
&& enchantment.getAttachedTo() != null
&& game.getControllerId(event.getSourceId()).equals(enchantment.getAttachedTo())
&& game.getPermanent(this.getSourceId()).isCreature()) {
&& game.getControllerId(event.getTargetId()).equals(enchantment.getAttachedTo())
&& game.getPermanent(event.getTargetId()).isCreature()) {
for (Effect effect : this.getEffects()) {
effect.setTargetPointer(new FixedTarget(enchantment.getAttachedTo()));
}