From 632775c617613a9cf97f155d8368d5cdbe50ddc2 Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Sun, 5 Dec 2010 02:40:13 +0000 Subject: [PATCH] fixed issue 39 --- .../src/mage/player/human/HumanPlayer.java | 9 ++++++++- Mage.Server/plugins/mage-player-human.jar | Bin 11110 -> 11177 bytes Mage/src/mage/MageObject.java | 3 --- Mage/src/mage/MageObjectImpl.java | 13 ------------- Mage/src/mage/filter/FilterObject.java | 1 - 5 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java index 3f6e79d0711..844559a5f7d 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java +++ b/Mage.Server.Plugins/Mage.Player.Human/src/mage/player/human/HumanPlayer.java @@ -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 { 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; } diff --git a/Mage.Server/plugins/mage-player-human.jar b/Mage.Server/plugins/mage-player-human.jar index fd19e97cd05fb9437d9224323d061a7b9408f5fa..e87be8943c297faa0a28aef4d02414f0538432e6 100644 GIT binary patch delta 8686 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 delta 8665 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�zfZ z;Xaf`!`lZ;5;>>4Z*@nIbVuYKP+-&9{wN&-K+1uJp*paMKCx+MW6cIT|KVi%Lw?a6 z@7#KN&4Vwo7fl(wtBe0ehxGtTNbDa?Wf#Lz?clF@z&vMqP8vE$Op*mI7EGUQv3;jQfn;$ zkUTu~i_3Ehu%p`v*}dAB+S9@_kzy1hc>4)?cz(vM6Bob2y-yt!zjcw6^{U6a+{h&Q zl!|7#yQoz?O}L^QKLMlWib3rSo^~){QTL%-uEn*G?Ru!E1v=~!w=?MsZYu9VGO#J^B`HB7D=TRj z5GRpGVK!M|I;jSZeK#B49%h zYhqsrjZVnz87P893kw_KSc+)cx2Kq#Hh(>-Q%fK9n%(-4rx8)^nm-YT13wI5J*`fG zcP>P@mHsx)y+BM_ktg69)OfMuLFHUzASCD45=yD7) z_yN1+=VPk_u8?0ukE@OMIvWR8GSp7 zG#Xo26Y89k8#-vS(mGQ9r9PmzWQ+SmsxA6Hr_JohRhxQat5uR6VNJ&PSq!pT8u`b6m z!#Wg^Llgc96@4%VDyMqDqgg^b^4+t&NL<-z`Dv%ZNB$;^tQD+rPic3*{FaWXRm7=P z37b=C8z;$tES!E@r!S+A-z~=HrQG)}F|+fwy{s2q;;PQPYXFD%A3g)~wHbAB^3uq{^AQ`8(h8TwIo zQV*Vur1qCA!|TzmOU0Z*TND!r=J=Q#XWgmTsoVfl(dBb3UtMh7Z_P!XR(Q%aAwC5I z{RF}U!LMaABzU-%+DhtN0XoN5?&xR1F_oVkO6I`IVyB1WF;=_jzjE_umEB@7Q}c2w zjawNb7YHp$$UuB`fM#vKG(bJ&!{~#0!01CRg5h(!Ahh4Ppc|DX+b8vVHg%u|O#;Du zU;49zGT)sZ!zW|8^F137%@-XB^>^nOr3A)u@i(5Wi6$~jBGNdQ?D|33J-=^ITh`yG zPsoPo|D{hPu9s0Yjr&Pt{re6C*5H-Z+SZA#19P#27QTqo1BA+nyHa<0?8KcQo`I-B+Am#klIwXo}y~ z8@H-uFOVGj)<-&#tiP+pkPf7he#Bz?s4|VFo>H7n(wn;PdZ%zBZQ;wZF^0Smi+d>3a0#2HgjO&SiNuNpWH6^K{l zsoqcccRN~4=hd&zonN1yy*{UTeIAO5R5fcR91cin&;=i9df%#S$d;(S*7tozLV6}Z zx*c|OMM2=&(I}!npN&Rx`ZfB%e7>p02=N($`~X9DAho(09=^wlLOTA5 zm4(7=n_Vf})_8UIxOx2R%fv3|Wy`AYS5QS1kv^83R)VHrOiZ!n$! zTZS9YN#I%Zu76V?ww!}4uOoEazCK^|0KkSPnahT3r3uS!NV`D*W@>05* z#x(p?uF7P^#dYs7zAs5v*C(T1uJQ}J!DD=W^e(PR&U@hh$pQW)cE1(SrX&2z{fjWL z{fpKNeE;CL9ELyyw122y?r0f2mlOtOSwPE6V_XHK%%P;FsaOs@SL09_-`;ua#XbUc zQBu?4=GNint>dk!=jGRS!NS($=H&)&?69eT*e1p%zwuA;?d&LXjc|d^Rcpt&lovW7_Z2u!&{jZDCITds}vAB=Ij65 q?%zn)zf> 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> 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> 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) {} diff --git a/Mage/src/mage/filter/FilterObject.java b/Mage/src/mage/filter/FilterObject.java index ef80f89bfde..ea3e7179bcf 100644 --- a/Mage/src/mage/filter/FilterObject.java +++ b/Mage/src/mage/filter/FilterObject.java @@ -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;