github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-03-12 17:00:08 -09:00
Code Issues Projects Releases Packages Wiki Activity

fixed issue 39

Browse source
This commit is contained in:
BetaSteward 2010-12-05 02:40:13 +00:00
parent cb3e454002
commit 632775c617
5 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java
View file

@ -57,6 +57,7 @@ import mage.game.permanent.Permanent;
import mage.target.Target;
import mage.target.TargetAmount;
import mage.target.TargetCard;
import mage.target.TargetPermanent;
import mage.target.common.TargetAttackingCreature;
import mage.target.common.TargetCreatureOrPlayer;
import mage.target.common.TargetCreaturePermanent;
@ -185,7 +186,13 @@ public class HumanPlayer extends PlayerImpl<HumanPlayer> {
game.fireSelectTargetEvent(playerId, target.getMessage(), target.possibleTargets(null, playerId, game), target.isRequired());
waitForResponse();
if (response.getUUID() != null) {
if (target.canTarget(response.getUUID(), game)) {
if (target instanceof TargetPermanent) {
if (((TargetPermanent)target).canTarget(playerId, response.getUUID(), null, game)) {
target.add(response.getUUID(), game);
return true;
}
}
else if (target.canTarget(response.getUUID(), game)) {
target.add(response.getUUID(), game);
return true;
}

BIN
Mage.Server/plugins/mage-player-human.jar
View file

Binary file not shown.

3
Mage/src/mage/MageObject.java
View file

@ -27,9 +27,6 @@ public interface MageObject extends MageItem, Serializable {
public MageInt getToughness();
public MageInt getLoyalty();
// public Zone getZone();
// public void setZone(Zone zone);
public void adjustCosts(Ability ability, Game game);
public MageObject copy();

13
Mage/src/mage/MageObjectImpl.java
View file

@ -32,7 +32,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Zone;
import mage.abilities.Abilities;
import mage.abilities.AbilitiesImpl;
@ -57,7 +56,6 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
protected MageInt power;
protected MageInt toughness;
protected MageInt loyalty;
// protected Zone zone;
@Override
public abstract T copy();
@ -81,7 +79,6 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
name = object.name;
manaCost = object.manaCost.copy();
text = object.text;
// zone = object.zone;
color = object.color.copy();
power = object.power.copy();
toughness = object.toughness.copy();
@ -158,16 +155,6 @@ public abstract class MageObjectImpl<T extends MageObjectImpl<T>> implements Mag
return manaCost;
}
// @Override
// public Zone getZone() {
// return zone;
// }
//
// @Override
// public void setZone(Zone zone) {
// this.zone = zone;
// }
@Override
public void adjustCosts(Ability ability, Game game) {}

1
Mage/src/mage/filter/FilterObject.java
View file

@ -32,7 +32,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import mage.Constants.CardType;
import mage.Constants.Zone;
import mage.MageObject;
import mage.ObjectColor;
import mage.abilities.Abilities;