From 87b469fcea1bd72d593cc2dd56bee551964a34bb Mon Sep 17 00:00:00 2001
From: deadlocker8 <goldi.96@gmx.de>
Date: Fri, 22 Apr 2016 16:04:26 +0200
Subject: [PATCH] Fixed #3
---
class/application/Controller$5.class | Bin 1580 -> 1609 bytes
class/application/Controller$6.class | Bin 1498 -> 1527 bytes
class/application/Controller$7.class | Bin 2481 -> 2481 bytes
class/application/Controller$8.class | Bin 2452 -> 2452 bytes
class/application/Controller.class | Bin 20904 -> 20904 bytes
src/application/Controller.java | 6 ++++--
6 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/class/application/Controller$5.class b/class/application/Controller$5.class
index 214ee6007f791e9e7d1f629ec33131901f2caec7..ff65ae4e0c93ec903179d2e54404bff4359b5f6a 100644
GIT binary patch
delta 351
zcmZ3(bCQSa)W2Q(7#J8#7(zF4)iO<f#iYSu%wWmGV8viPxs^$S&6bD3j=_HNW+q)W
zT?R)U2D8Z$%pTla1v!b8sVUBhMJbcxm~|LECwDW;GkQ;6%{+lQh#`2g9m^BWZ4Ar|
z%nS?+L6fyv73#MzXl!H9(b~cwvW>yWS8EG{00=`ww=r03W3YkpL287yF*s~wU|?Wo
zkYr$BP-5U<U|^iXz|J_2L5OiagDB%71{uaB40?=98JrlGF$6L$XOLoGU{HWq#~{rh
z!vF$749*NL42%qV3@Qvot_(a3Obl)e3=Av`OrmT8jtsI4?hK3!{0s~XnhZ<~ObiSR
zoLbrk7(BKyc!BI@0^7~Tz{tSBzz8-Uq=bdRhk=2CiNTk_4@~<r1b~fHU<hOgVPIh3
MVqgU8U|?VX0MjBmGynhq
delta 330
zcmX@fvxbN3)W2Q(7#J8#7(zC3)iO=q$)v_+$-`j9U_JRMlP-rbgDnq(9fSSkRwgYr
zT?R)U2D`};%pQ|-nYCCv7#Soc_b^JZaxpM6cun5HJb^ioA!xEU%M;FJ49pBn3=9kb
zlPy>k>b15o2y9`{*v6o<jlpOeg9VfirM5BXXl-E-*~Va_wS_@w8-v3}1_lOZ21y16
z1~~?H1_s7C4D5{a7=#$-Gl()SVvu26!eGF-l);~I8G{r91A`dEA_i#&83qstU~pz|
zVPIr%Wnf@nVPFzv6G(DokY#XVU}WHDU|`T>U;=C4)Y3k{;J%H)6J#3`*fur>Mg|53
rMzE<M$FneaGcYhPG59d}f@wbnf3TSf3;_(m3=9k)Z-aC&FfafBUOqH8
diff --git a/class/application/Controller$6.class b/class/application/Controller$6.class
index e54264ca2edcfce086383ee75a7c51216832f40a..027974dcc6466893efeb7b749ce78cc985b6df6c 100644
GIT binary patch
delta 382
zcmcb`{hgcZ)W2Q(7#J8#7y>tP88M0JGU&52=rJ;I<m9JkChI$T@-P@M7*3wSq{X4a
zV9di{!eBbtg-Jo$oQJ`J!IF`IB|R}Wm63tR2cq6RF*kMcekKV<gUL6TJh-_EauO?3
zQ=AivQYOnW>oB@b_GXr6bf28fJb~Gd!GH2U=7Wr<Cm&#u=UmRf%)rdRz~DUj1&e&W
znAR2siERuzzFJ!tgtWFWh;3sq0x`ERnCWP3VG!BIV6~Bffq|JpmVtpmiGhQGf$;(Z
zJL4q=A;!xLqKwxVWEgKSXfWPnFlM~P;KX>FL5_ieK>=a`gFJ%*0|+=X*fTgVFfwQ`
zNHaJx@G&qkI599VurM%*rmzV(GAJ@QGcYm;GB7Y`GB7bPF)%Q2YH1%}aM{M-2C|z8
zY&RPNBLf2iBiMY95*7vz1_lNu22TbrFzwCY12$8I!IvR`fq{XGff1~Ofq?-4`ou!m
delta 366
zcmey)eT$px)W2Q(7#J8#7y>qO88LCFFzE6y=rQO|Zeda|G2~$|VlZZ8U`bERO=V=@
z@yW?g&rH^LPs~lV=3+2qFlT2lV`Sifh&p=mFjz2HP7Y$yntX^!l-+{Cj*&q|W3nNO
z?Bw4}s*`n@wHRF{M=;AXx=pTNp1|zO;5V6@<sjp!$!A&QIj1u)GcYkQFgQ;B$|7Gc
zq_u@XY#W1)))oe#Eer-Ap4JuyiERufT3Z-IwlP?3WME)mW{_oIV31>AXJBAF&%n-j
zkwJ*@5`!q?RR$Tx>kR6QHy9ikZ!*X+FffQgjAoE$P+$N7M+SQa2L?t4M+OE476v9!
zHUUQlMFuAZMg~C!1_n)r5GJq&PA%;N49?paTtT)mfo)@BU}RumU<8{AaxM#lI|Bm)
g6N3kXCz$qP@CKWy!r;T;&%nUI#lQ&G!N9-(00=leV*mgE
diff --git a/class/application/Controller$7.class b/class/application/Controller$7.class
index d61976a7aeeb3560e3825f3ec598fed2f17e03c1..7f51833b4c466c9acccd2a116b74b66b50fc1632 100644
GIT binary patch
delta 83
zcmdleyis_=4tB;blXtRza{S4_&G?H!i19arDC1uSO~(HW`i#FBESQ)X!kAbXvY1#I
p%9+?1I+!>aCNps{Ok?6@Sjfc3u!4!7VFQx@!!9PF$!|E00ssK~6^;M^
delta 83
zcmdleyis_=4tB;*lXtRza{SJ~&G>^si18<bDC2JiO~$_r`iwsrESMM>!kCyCvY40|
p%9&UhI+)lQCNps`Ok?6^Sjfb~u!4z~VFME%!!9O)$!|E00s#AM6>0zg
diff --git a/class/application/Controller$8.class b/class/application/Controller$8.class
index 0bb9c120efd23b4a10e1fa46428acd8e6f9724ca..8711b3bf8f6442640e8de6cdfbe744dd442a1164 100644
GIT binary patch
delta 83
zcmbOtJVkiJGIqwvlb5qUcbvh%%`}rih-nssDAODUO{RGa`b@JJESMHC1TZaTh-O;C
qkioQ!p^|9@LkH7JhHj=c4AYp_GR$RK$FP)XJ;QpYjg!xF90dU0E*QoD
delta 83
zcmbOtJVkiJGIqv^lb5qUcbvw+%`}}sh-n6cDAOzkO{O^v`b;wzESMHB1TZaRh-O;E
qkioQsp^|ACLkH7xhHj=+4AYoaGt6aL!?2WTEyH@I^^?zY90dT_t{9>K
diff --git a/class/application/Controller.class b/class/application/Controller.class
index d79542545c43205b875435062864f7c1a9df6c34..be0f785fd6d97e0800b493041aadd8744406ca4b 100644
GIT binary patch
delta 1056
zcmZ3nm~q8o#tmOBSXVI=F|OYH%VHU0?0N=H#tjTYj2jsw7&kMhF>YaSW!%OPz_^hi
zo^cmL2IFpq62`p@lNk3g9A!MfaFOv4!!5?c3{M%4FuY+r%J7Nt7{d?7;|%{8PcX7D
zo@5kdJjJNSc$(3i@gAcM<NeKlt!6R0K4#!%e99oh_>4iB@i~Jw;|m63#+M9^jISBI
z7~e32GQMSqW_-tx$oQTio$&)hF5^drV#ZGl&5WNJrZRqESj;5Ku!2c!^BtRwjGj^q
zEKD*C@=US}+Dvi`=1d9<&P+-S{!A(isZ1IS)l9k!{Y*v-OPMSf4lr3V9AmO#xWr_`
zaF5B3;T4kuBLkBQqZpGXqZX6j=4*C}jEbQQ@=Re2s!S0KhD=cmwoEY$o=kBJ@k~h!
zrA+AzolH5KB^;(P))zAfF_kjNF_kl@FjX+<FjX>`F;y`*FjX`7Gu1LgFx4?6Gu1O>
zF*Pt0Ff}riF*PyNFf}tYF|{%*U}|UB$kf4bgsGF^I8ztHEv9aU*GxSO@0fZS8JYSR
zg_!yoMVTfusxWO~)MVPqFpYtM!GnRFfq_wrVLHPM1_lsovaZuv$(;-wOuHEPnRYV>
zG3{kgXWGx8%e0%pjOoy3Vdn{qvBwx#m`*UTF`Z)IW;(+l#dMBAiRnCpA=5<$Q>M!d
zu1r@LJeaOCq%hrJC}z6F(8P3yVItE#h80Zr8CEkrVmQR~gyAUDbB0??FB$GKy<zym
z^nsCq=@TO}(<w$irZ1aZ?=jZ@U|?bT#lXh&hk=LbAA>kEBZC4nGlM2G3xg#yD}xO)
z2ZJj!Cqp1J4?`p~A43MS07EXb5JN4qFhc{g7{eT9afa2*k_@|;r5R2#%Q8G*mScF#
ztjO?-S()K4vl^oivj(Fmvo@m+vp%Cf(;r4_W<zjb#4vC&FfiIMOy3;q&dexj%D};F
z#=y^P&LG5W$zZ{3&0xoD&fv~$x4F`zgSp;`ftA^Xfs5IVfrr_HL5SIlL4w(b!I0UH
z!GSr1A%QuJp@BJ^p^Z6`p_@6HVK#FN!#w7AhSki83_F;U8ICfiGTdQKW4O<p$?%Oi
zo8c#O9wQ%f0iz&uF{1`^Iim@41*1806=OJaHDfGuEn_NkJ!2MgBV!eF6JsrND`QtZ
zb35a7=1#^X%-xK;nR^)bG50fGWuC}*gLw+$TjptuADCw{u`|zQ5@w#qB*wge$&7g+
zlMVA?CKu+VOrFfknIf52FvT#hX3At<%T&g^o~fC6BhxJAO-yr{w=!*E-p;h0c^A_e
z<~>a3nfEh2V?NCEiTMcASLPE;KbSq3S(r~TZ2s>vgHiAt0}Jy71~KMK4ARUO7*v?A
uY+m8V&M13}ft&d@gC_GG26N`S40+7=7;2dBGjuUOVCZLlxcQ9#9Yz2;2n%We
delta 1056
zcmZ3nm~q8o#tmOBSXVL>F|OMD%VHU0>^cTc#`O$Bj2jpv7&kGfF>YpXW!%aTz_@`S
zo^dBb2IDS<62?6YlNk3h9A(_kaFOvK!!5=`3{M#kGrVCu!tjalD8moNV+{Wok2A6`
zo?sMZJjtlWc#6@S@eZR6<K4}Ft!6R0K4jo#e9R!j_=G{3@hO8g<1+?h#^(%<j4v6y
z7+*1jGQMVrW_-ht$oQ5ao$(z*F5`QKV#W^)&5R!zrZRqFSj;5Mu!2cs^BtRwjGht<
zEKE`i@=VeU+DtMG=1g)7&P)mn{!B^?sZ44N)lAw9{Y(Z7OPS0V4ltQB9AmOzxWr_|
zaF5A`;T4k|BLkBYqZpGrqZX6T=4*C}jEcbw@=PHNs!U-FhD;F*woFkBo=h<e@k|K}
zrA(;|olIGqB^;(P))z7eF%>h&F_ki?FqJXrFqJcyF;y@)FjX@6GgUK0Fx4<5Gu1L=
zG1V~?Fx4}ZF*PvMFf}qXF*P$RU}|O9$kfJggsGk3I8z71Ev8O}*Gydu@0hw78JT(*
zg_wF7MVTftsxWP0)MVPsFpYtM!GnRFfq_wrVLHPM1_lsovaZuv$?XgrOgk9(nRYS=
zG3{nhXWGl4%e0fhjOoB;Vdn{qu}2tKn2s^9F`Z!GW;(?n#dL;2iRmnZA=7yVQ>Kdy
zu1uF0JeaOBq%d7$C}z6B(8P3$VItEVh80YA8CEkrU^v9|h~X&HQ-)hi&l&DAy<+&n
z^p25%=>sD((+NgCrcaw(?=jYYV_;$W!NA7!i-Cvf4}&<<e+C6+Mg~o0CI(ApW(FH(
zHU?K_c7{M^E`~^E9)=8NK89Ro0ft&;L52oq5r#R;q718<#Tj-nOER2fmS%XsEW_}a
zS)Sn+vm(P^W)(&uW;I4pW=%#NW?e>oreBQK%=+NKh+*JlU|_Uin7%pIotaV6n1O@Y
zgn^&gltGBuoWX+GlEIGIl);_ZW^<)S2Xnmx11qx=0~fOk0}rzsgAlU^g9Nh|gCVmI
zg9CFALjrRMLj!XtLmP8ALpO6I!))d#hI!1f46B*r8FnxyG8|=2X1K$g!f>BCo#7jE
zCc{tW97aCoJVrt0LPibdQbrTzGDdUe3dV5eO2$~`YQ|LNTE;Bqdd4c|2F6<EX2!01
z=2ph(%<YUzm^&GFGj}oWWA0_V%G}R*gLx9;TjnW@ADE{zu`|zR5@w#mB*r|C$&7hE
zlMVAiCKu+#OrFe3nIf5&F~u;iWXfb-%~Zy`mZ_O}J<}}a4NP;HH#2Qv-paI{c?Z)O
z=3PwZnfEe1V?N0AiTM!ISLS0(KbYN^S(r~SZ2s>vgHiAd0}Jyx1~KLf4ARW!7*v=q
uZC>HW&M13>ft&dzgC_GW26N`y40+6V7;2dBGITNDW9VnTzxj;+9Yz3xD+-$c
diff --git a/src/application/Controller.java b/src/application/Controller.java
index 816c6cd..6496172 100644
--- a/src/application/Controller.java
+++ b/src/application/Controller.java
@@ -417,8 +417,9 @@ public class Controller
{
hideWishColor();
}
+ Card playedCard = game.getPlayer().playCard(card);
setPlayerDeck(game.getPlayer().getDeck());
- game.playCard(game.getPlayer().playCard(card), newWishColor);
+ game.playCard(playedCard, newWishColor);
}
});
@@ -468,8 +469,9 @@ public class Controller
{
hideWishColor();
}
+ Card playedCard = ai.playCard(card);
setAIDeck(ai);
- game.playCard(ai.playCard(card), newWishColor);
+ game.playCard(playedCard, newWishColor);
}
});
--
GitLab