Failure/foul-magics
1
0
Fork 0
forked from External/mage
Code Pull requests Releases Packages Activity Actions

Refactor: replaced sourceId by source and introduced source param in some methods;

Browse source
This commit is contained in:
Oleg Agafonov 2020-12-12 20:23:19 +04:00
parent 2bb472607b
commit db239a1055
3205 changed files with 7080 additions and 6795 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Mage/src/main/java/mage/game/command/emblems/DackFaydenEmblem.java
View file

@ -54,7 +54,7 @@ class DackFaydenEmblemTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.SPELL_CAST;
return event.getType() == GameEvent.EventType.SPELL_CAST;
}
@Override
@ -137,7 +137,7 @@ class DackFaydenEmblemEffect extends ContinuousEffectImpl {
for (UUID permanentId : fixedTargets.getTargets(game, source)) {
Permanent permanent = game.getPermanent(permanentId);
if (permanent != null) {
permanent.changeControllerId(source.getControllerId(), game);
permanent.changeControllerId(source.getControllerId(), game, source);
}
}
return true;

2
Mage/src/main/java/mage/game/command/emblems/DarettiScrapSavantEmblem.java
View file

@ -50,7 +50,7 @@ class DarettiScrapSavantTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.ZONE_CHANGE;
return event.getType() == GameEvent.EventType.ZONE_CHANGE;
}
@Override

5
Mage/src/main/java/mage/game/command/emblems/JayaBallardEmblem.java
View file

@ -103,8 +103,7 @@ class JayaBallardReplacementEffect extends ReplacementEffectImpl {
if (controller != null) {
Card card = (Card) game.getState().getValue("JayaBallard");
if (card != null) {
controller.moveCardToExileWithInfo(card, null, "", source.getSourceId(), game, Zone.STACK, true);
return true;
((ZoneChangeEvent) event).setToZone(Zone.EXILED);
}
}
return false;
@ -112,7 +111,7 @@ class JayaBallardReplacementEffect extends ReplacementEffectImpl {
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == EventType.ZONE_CHANGE;
return event.getType() == GameEvent.EventType.ZONE_CHANGE;
}
@Override

2
Mage/src/main/java/mage/game/command/emblems/MomirEmblem.java
View file

@ -89,7 +89,7 @@ class MomirEffect extends OneShotEffect {
}
}
if (token != null) {
token.putOntoBattlefield(1, game, source.getSourceId(), source.getControllerId(), false, false);
token.putOntoBattlefield(1, game, source, source.getControllerId(), false, false);
return true;
}

2
Mage/src/main/java/mage/game/command/emblems/ObNixilisReignitedEmblem.java
View file

@ -36,7 +36,7 @@ class ObNixilisEmblemTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.DREW_CARD;
return event.getType() == GameEvent.EventType.DREW_CARD;
}
@Override

2
Mage/src/main/java/mage/game/command/emblems/VenserTheSojournerEmblem.java
View file

@ -56,7 +56,7 @@ class VenserTheSojournerSpellCastTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.SPELL_CAST;
return event.getType() == GameEvent.EventType.SPELL_CAST;
}
@Override

2
Mage/src/main/java/mage/game/command/planes/AcademyAtTolariaWestPlane.java
View file

@ -94,7 +94,7 @@ class DrawCardsActivePlayerEffect extends OneShotEffect {
}
Player player = game.getPlayer(game.getActivePlayerId());
if (player != null) {
player.drawCards(amount.calculate(game, source, this), source.getSourceId(), game);
player.drawCards(amount.calculate(game, source, this), source, game);
return true;
}
return false;

2
Mage/src/main/java/mage/game/command/planes/EdgeOfMalacolPlane.java
View file

@ -84,7 +84,7 @@ class EdgeOfMalacolEffect extends ContinuousRuleModifyingEffectImpl {
@Override
public boolean checksEventType(GameEvent event, Game game) {
return event.getType() == EventType.UNTAP;
return event.getType() == GameEvent.EventType.UNTAP;
}
@Override

2
Mage/src/main/java/mage/game/command/planes/PanopticonPlane.java
View file

@ -76,7 +76,7 @@ class PanopticonTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.PLANESWALKED;
return event.getType() == GameEvent.EventType.PLANESWALKED;
}
@Override

2
Mage/src/main/java/mage/game/command/planes/UndercityReachesPlane.java
View file

@ -82,7 +82,7 @@ class UndercityReachesTriggeredAbility extends TriggeredAbilityImpl {
@Override
public boolean checkEventType(GameEvent event, Game game) {
return event.getType() == EventType.DAMAGED_PLAYER;
return event.getType() == GameEvent.EventType.DAMAGED_PLAYER;
}
@Override