mirror of
https://github.com/magefree/mage.git
synced 2026-01-09 12:22:10 -08:00
Fixed some more mixed up parameters of target classes.
This commit is contained in:
parent
8beca6ddaf
commit
33918623aa
11 changed files with 33 additions and 24 deletions
|
|
@ -184,7 +184,7 @@ public class TargetPlayer extends TargetImpl {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
|
||||
return canTarget(id, source, game);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ public class TargetCardInHand extends TargetCard {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
|
||||
Card card = game.getPlayer(playerId).getHand().get(id, game);
|
||||
if (card != null) {
|
||||
return filter.match(card, source.getSourceId(), playerId, game);
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ public class TargetCardInYourGraveyard extends TargetCard {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability ability, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability ability, Game game) {
|
||||
Card card = game.getCard(id);
|
||||
if (card != null && game.getState().getZone(card.getId()) == Zone.GRAVEYARD) {
|
||||
if (game.getPlayer(playerId).getGraveyard().contains(id)) {
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ public class TargetCreatureOrPlayerAmount extends TargetAmount {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
|
||||
return canTarget(id, source, game);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ public class TargetCreaturePermanentAmount extends TargetAmount {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
|
||||
return canTarget(id, source, game);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ public class TargetDefender extends TargetImpl {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
|
||||
return canTarget(id, source, game);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,7 +104,7 @@ public class TargetPermanentOrPlayer extends TargetImpl {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
|
||||
return canTarget(id, source, game);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -127,7 +127,7 @@ public class TargetSpellOrPermanent extends TargetImpl {
|
|||
}
|
||||
|
||||
@Override
|
||||
public boolean canTarget(UUID id, UUID playerId, Ability source, Game game) {
|
||||
public boolean canTarget(UUID playerId, UUID id, Ability source, Game game) {
|
||||
return canTarget(id, source, game);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue