Fixed some more mixed up parameters of target classes.

This commit is contained in:
LevelX2 2014-07-30 10:47:51 +02:00
parent 8beca6ddaf
commit 33918623aa
11 changed files with 33 additions and 24 deletions

View file

@ -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);
}

View file

@ -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);

View file

@ -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)) {

View file

@ -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);
}

View file

@ -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);
}

View file

@ -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);
}

View file

@ -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);
}

View file

@ -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);
}