From bc3acccf2cb3a90e1449d995e5184e9557cb5aef Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Sat, 26 Feb 2011 00:15:15 -0500 Subject: [PATCH] fixed first turn draw skip --- .../src/mage/game/TwoPlayerDuel.java | 4 ++-- .../plugins/mage-game-twoplayerduel.jar | Bin 4835 -> 4870 bytes .../plugins/mage-game-twoplayerduel.jar | Bin 4835 -> 4870 bytes Mage/src/mage/game/GameImpl.java | 8 ++++---- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java index 09c82dba0e..b5c1081254 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/src/mage/game/TwoPlayerDuel.java @@ -63,8 +63,8 @@ public class TwoPlayerDuel extends GameImpl { } @Override - protected void init(UUID choosingPlayerId) { - super.init(choosingPlayerId); + protected void init(UUID choosingPlayerId, boolean testMode) { + super.init(choosingPlayerId, testMode); state.getTurnMods().add(new TurnMod(startingPlayerId, PhaseStep.DRAW)); } diff --git a/Mage.Server/plugins/mage-game-twoplayerduel.jar b/Mage.Server/plugins/mage-game-twoplayerduel.jar index 5136d69d1eabf0697c844ea33483e5f7ebbd4e1d..fb9c6b34063da93d0c52ceee9ac713b6482c8054 100644 GIT binary patch delta 2473 zcmZ8j2{0Sz7f;-Rh*nUlm69S>>kR5BExL#z7DbRE!lDRqv`A6es_53nSx23%e-Rbb zxsFj0a-{1uRB!sCjpaRL!)#uw7@joGz$FM-P5P{QcG*U3-R7B-wVvrFr9JD3=^OrH45je2xsDXL#e zRdrB0Q8@-_Wo3oP9IMIPh*uuZSNA=ig@S!T<2TIY)rl%PE4hXk4SEdfQdQq#TrpGt z>V2E*)~ZZ{@s)s4NNz=mTLH{#0p&%%8eeeaAt`au5KwQDL3?TE54$XGE2Ff?@ynn zibN$WVqz_@P7Wr!lGT;JI=Lr&@N~aX`zByGYXZP*Q*IW%lsAwL@|&Y9wq!ir?bPrQ zX|A>b*Gny)HAUM9HdfB+o?<+^lPTU(F$-p}U10^1u$ooH7iuXLPYr>&COIUm_7r(O07f zPhKvmw|G9ypOfa}NMw@ueCksp|CZd{q|uRP8d~dj;@ubmZ(|x$&VMvR%S0KG??nYi zdIq~-pS10#!@O53qttSWajp7D!L*wnLxlsIyE99tlBy^D&EKvpdE!A*5)twPOzX?6 zVLlrMETY^Q)zD5SGkjVl3Ghn6`tG0dYtlJr=+{ZF~aXuIjC@5xpcZ*A9ZSk`KLmTCcJbcpuSbtn+Ck zAt9I8q;~SsK%w1mqOQemSwqoAMb8s#>@@17X!BaCcwfIute{#I-E!7cT$?ZI!p&U82dY!{pQU|f_BF4-;li#d;JeCoxTI@10)HGiRI(7_kf7EGX&&LC zkd?^x)5}J;aWV*gE&$*g)kN5s)NwyYP23=}%Gj<7i*$2vFx9Jcad=ys8t(e#IpLL1 zzeGSk5@uJo|L(WX#&RY15FxiYTPZVYLnesyNTAP)7`Kq!5KaIEBZeN8UCXlU%ZEuk zmCFh8C&(y<(1QmU?wN+ofy{;&d{n{&cv17T8D*PQGfpX{3_ zo2xgdKtTe;o?1`k?09asrqhOcPcL_~oJ*o(-LmG@)oRXJ=Mkbv_@WG4qF-pvc~>2J zP?F}e+>i=IjgETUh?0Ifdr9#ePRH%`?zX{*t;6jQ)BRZ5&wH?>Z+YtL^iKRa>dW77y;X}l!hk9j&8CnNunI`hy2Ef8^VjHn$#GE}VaNm4K&C>Tcw z^TUOT^i+cqjD-Qih7U*rx+;?V%JHtQi*n){{GQgLCaab=U3Rv=zs#(YextBxI%kr% zEDfQ%ADbqY(9f`cU3hptY>6KstNDWVHP6czV+V^&X0p|_N206mIq_6$waupwE)Vv& zI%}Vfc|G!SLffycL z{SJ}gqVrL&Lrze;AQDH^y90__@PL9+A!3q86hce}m_;=gJ0*80cMc`d50m=g03d+< z{VpMD$}wqbzL@Y)S*4f^*Y+W$LERA(miy0NJCI8{|JDKkC20k`!UhehfV(T S-v3D~rBaUB@r8*VlK%iv>|YxI delta 2434 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 S-v3D~rBaUB@r8*VlK%iv>|YxI delta 2434 zcmZ8jc{~)_7q^XVW^9v(v1fQlM#k70TY8q1eHbLW#$F`5F_GPbv6S%aYo1+_FwY)Y zD`YQQwjp6qdFb=|^yzp1xaWTFIp=PlbI$!nihU9V8|u;0F;ks3l~Pm^7)Faa5ppTC zr>IZpOl*p>oFLUDue}Nb02S3DkSI(I!=c?wc+uRUEV`H)cf9d6T`x=!kQ(YyUID0P zd{wY$mh+coxwIYAWaPBmL|y00_ea*Pp9Qz#1j|0P2_Xo7^W*SpojmZtiRnm3%_4rg zrFA88z|3+pc_({+VILQIz}aRLoNuqtwJ4K2mmJF`wrDRI%Uy)N*~JM!cyC|9ovUpu z%cCAMZH`{!*iC+&kj~khmuGR#3D9os=8>y0tBEyH$$U0VK`E248=tSV^Z zC?P9c9OW@ggp6OZ>{oV{E{F3TXmk&cDs=l0Tp)#oQhhzFPPL$ak-JPyIa zP8S{HB2(q*v_6XH1$ODMOqh{y!xxM1IoM`_`WU?FfH8xW~$r7(~i(b5n zoQnsp6UIQKH`hJ@pomBxLha{8KJ%cD)=v6*O~hN*39pSji9W#Ll(u}FeOj)+`8D-i z-;SG!y?sz-_qaz>LtbmWc@ECRba-*(G{kBouEAQSB7QkLqgWzZq_ZNg0NazQ4*lHi zqckb|Si+}L434W^`>QP~`)Tjh8vK>y<6 zf|lDm`h?yaRo{^lPHd|w*8Rl^wMCN*oJZP@{m?zzRzA#YYh-jmHiz-sJA4K%jR}{T zH(fDZ<=1W7W9%(@U0Cw>nj^>VTp_JNXF9A#4m<#4tUuSjTxJRmM$Q$l^3`nE3A9VP z=ISpfC{8hK*QPwKAKGG4b<&UvjvPb=M(z&o;t(Y1+R!$iRs-mG(Z7e3P^@6JFg zL#v_v#+;KE8u|n-JnT*2@#BA<2|~EPh-+Y=e37GsyW*xKS1p!4n3l5dZ7cXGEZB%d zteX%R8n12NR_mxtUfHyGNJ$!1=36NF0=$7D#`jnj}b*J(v>kJ{9#S6%`aRXsBm3tN1!kSXDPOZ^;IpW-`?;%l6!0h5(a*$dyoXK~T-&irpoo1Nr_Up=UB!*XKUZT;#o$niB^kDx>)9ZCo48QCFe1hM){*cKPhA_3zZi5)0ee7SlrpQ z+b!^|?`(uI%tf0 zwuQ>$wCQ>$wIq(bD6J{31-dT{k@nK|(41D?0sm~ADrCY81)r8zK)TmgRs50RntLJL z_T{_e2j+yQ8UPfnK2M1TkUw~pl!UH4rZ5UWYLz`2Kvb_(-=XXgx|kzN(U@4{=t&qC{5HM`WHqJJau@Hg=Mqlfyi( zIx#5JlGP2i1IT$Be*+{WWh%n|^*BsO;mwE2QGmY%k}52I7vX#I%LfpfS+sG(%nxMF zQ4Q^re#}1@BzV}S%smwaTuD^B(>KYzA~xni+27dC%*$7gkJ0iM9QvfM5&N-AK!Cd~ zo0MT`v${$*Hb!N}E7Gaoe8>&0kWBro=-C(Ie*Q8tUqm92c>M9t#dV(){sB{#R!ZiU zkf%aM0fp93kDBHj?N6$47P#T8a;Id2*u<)KhQG1OoJlwv^8fjUH=By!DFx9GKdj_9 ziSb=pDk|YK((R;RLPS+|(AkPN*mpa@8u z2l9b`o#-^9hE5byKq84nmMF*p68bHvPI!;PZyQR2P7LMY{vPhXE_Rl(zh3&pUiCMh SFqRV^b>bEW8@&> implements Game, Serializa saveState(); } - protected void init(UUID choosingPlayerId) { - init(choosingPlayerId, false); - } - +// protected void init(UUID choosingPlayerId) { +// init(choosingPlayerId, false); +// } +// protected void init(UUID choosingPlayerId, boolean testMode) { for (Player player: state.getPlayers().values()) { player.beginTurn(this);