From 6b9fade19d34604d6b566519c341d72bde38ec78 Mon Sep 17 00:00:00 2001
From: marc barbier <mmarc471@gmail.com>
Date: Sun, 13 Dec 2020 13:27:05 +0100
Subject: [PATCH] patch test

---
 bin/Serveur.class                  | Bin 1907 -> 2178 bytes
 bin/game/Joueur.class              | Bin 4683 -> 4901 bytes
 bin/game/Match.class               | Bin 2574 -> 2584 bytes
 bin/game/PlayerTesteur.class       | Bin 1266 -> 1064 bytes
 bin/game/cards/CardRegistery.class | Bin 6778 -> 6967 bytes
 src/Serveur.java                   |  31 ++++++++++++++++++-----------
 src/game/Joueur.java               |  21 ++++++++++---------
 src/game/Match.java                |  15 +++++++-------
 src/game/PlayerTesteur.java        |  18 ++---------------
 src/game/cards/CardRegistery.java  |  10 +++++++++-
 10 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/bin/Serveur.class b/bin/Serveur.class
index 87534d2d10f98f5c22f4553836b1d4f5ef65e8b7..559a1cd543bcfc66ac12d5bea4dddb3b3c36d969 100644
GIT binary patch
delta 1295
zcmZWpO-x)>7(I99&D`P5gbG;b3tFZW%1@<JD5dm4I|YhR9JH2F+WN<Ic!e2;88SR3
z;$~7erin2&&zQJy<7U*juw6i7lP;{8CXHRXF)`7&bYs%Q#5DRm_l<~YH}`(`n{&Q<
zzVq%kk80no(;xi(&0PS;uzFKZh-eM=A}Y}$@JuFIOvbXw++u8IW6ic!BG`vk=VK8S
zZO)d+>^p!?i4K7V517u!&KA-+d&VwUNn*Ru?Tq@`y7%IR2zt;e;LoqyA;bhCYgVCX
z6`}+#Z0M**Zv=ff;(X|9S&}#^uxl~7V#UVtD{E8vb!)w#qaVj22w+g)+0KM_U(T{)
zGx^lAWe;^-2*D&P<AHmlb|JrBy!S;2!~Z4wwv#$e;*><(`Nh{%8o{W5zM4&LScUV}
zn(bA8;_jiY%Mzyv^YYV4JGG=^3@<7<69Vm>i6;q9C6vB1Y<oqKqjWT-#JwcuplAA`
z>0B|HO)uz}#w!vpE6K|Eo&F*?i=aRtmCdhNA)KR@Oz$==g!2O7R5oqp?C1gwmAK%%
z=Wi7koiF{Bxc;vv^irViDP`&_d#3e`=SFOsH7r%Vnj*)!rZqOPf0F<I9Bh8*MdzM&
zPK2GtKugW{^r8k3LFZ(kxl~4jsg+S{YPaxw{r*j~-@Ju`^@kV;Qxj%Dm_cDmL%WZT
zo=qG!wL9p)WN2F$FarvCoX9f5W~d4`g4@8L2Mj8pRKTGfV6|e!{mLi>DsI^bR@~1F
zS#du#0=IGE6AT#A+xOhTm=Q4K7RFVDNmappTZK~$jo>B{Re5FiipsvKvYMAw(#vkb
z45|E#M~r)oH*;oYX+SgfV-BSW%p=8M71!}T_s{VM{^ah5&Oy727}r{!c0r<!v<4D)
zliG-OG@%oF(9OLE1`gpl46yidv|t!f#5sYZXu|{!@U?W{BGL1lG>eQS9K<pit0f#p
z5xuy^nYxZ6_<+N614r=@1}VkF*BHWWmirbb@PO0s5U211M(`s`|HPO5Gsf{NulNm<
z_#J2P2vcle8jtxl{gfG|{C5yhpBtBOnI}K<ui<qFHsqr82Hu2^ef@>EsLs!>YLLVg
zXzb%5ompTs%&RS2rG0VS$0Bn<UjH4txXL0HPiZnj6u%uk=Bb*?@XASqT^gfFEK6jC
p<evza+0znpgStygLp#4nOiT1vS74qH=`Dl1XBks<js<<l{{x1=BzOP-

delta 1084
zcmZXT-%lJ>6vsbzcZS&x3ob*&uBNg@pg>F4F4W3WY=P2J3y57np<10TBQ8I7ahYAi
ziyLix(x=XY`k-%SH6~4H%$BqXNz(+4|Bi1>bUiZ)#+b~^Irp6J_uTI}_s(Z6zc-t|
z{rPYYIFGYqPN_>K7B5C=C!vULIc}yfm)md(C0C*KT<cvpLI<4&FDYWHcG*s@+xeAb
zW_!zZHllRV?UhwR^>|;Y)f0W3HaMkd4S=~qa<-VuyBW9W*n;injMowB?Cap=C}-(b
zgk_fq1Hrz<vQtb5aCzGobS}y(ocA_E?TZnH6wj;{N=~VGHsKZvrSg*>BMct~QwKql
z5iT0Mrm$A*4JSFfZf`rqIY*?Hicu~xsxUVXgWkPRTV=^$T%rMf+IF)anv5|KMdym5
zt7j_cB=5M%Od-4GxWoSo^e#l0lnyq0azcia_0_$uXw0tXoV=S@mYxiz6vq#1&F9zh
zg^%--g)Q%CII3nmL)*{9{%$cfksozkAvy{rZ&Sv#vuo4#=A3<d-7%Ooc>ljg;mVL#
z3~u`a@ek-<wce0^Lz&)}dV6I+Ix^(cA6v1hmY%&4HS-8-QM_2nitTdr0ng9$xA3&a
z@hYuptx9uRyUz*hWR2dP`y{QDI4Z5Fv>w-fA>LnO&_^V#S0zy;l5UV}Tt7(Zeky&C
zssyzC`mb?)zy2hy?Q-E8y5o9ak3C{6F4PBH_DNTLQvEw&RO??$&1(H_y1`Fe3lg78
zC;px6;(B2Fm}Zg%7R6@y2v_VKcKBIr7*l$_OJ_w)lPsHM2r;2qyg;iIIZ7YTa+)@h
zJSUg3jX{oaPBJ5O%8lt_oRd<%ml;7WaEhCPz9s0apmU^T!vV^|+Lj;c4nurF8joSV
z<pSSJl^?jsPgF*^C#80{LXE5J(M_XB`XJEvm^YY}RaoM0aswqIACh5?kVxHSUN#QP
zwnuo2x6wq_r_$|`c;kE`f|g_=HwE#IWE(`xfmb8)Pwd?>DL+VKT^iC1ZW+9%3>kua
eu3t8oHvgc>z?NrTR$A~mqfdx0VzR;wvHTb3JMhK;

diff --git a/bin/game/Joueur.class b/bin/game/Joueur.class
index 3d7ca39f63451acfe6caadd4cbd4d72aba186afa..5d1fb9a1b8eac8472857573b2fcd3fd9759dde89 100644
GIT binary patch
literal 4901
zcmai233Oa#75-jkk~f*W&}5o~rcGf43R&7FLfMj%ZfV-kY?4q&X=z_(UXp2N<IPOk
z6a-pOkX4ke6%|m4m7-9|v{EQg6csmA+;<Q`MMdx&&*7l>-TzHyCX0tIdH;IvcfY&+
z?F;{X;uwH)@h=?(8cK%Eh}C#uEM=u^9c~R}+s#q4F>FSM8+!(~TY;nocOVu?XejSg
zXV-AzoNwV)&<gC}C1*<}jcxoPJ0oT^NcqmrdQP}l5Z|al>)>)AW!qLX*=0seo{gwa
z(eh9<lx)>dQ9DCb9WQ#<?h07(WGEI*=$NZvu7VnhHFor5cPMO4ENFS*LY09zI8lSE
zwr*oFG*lZXg(0H_1`1ImqlE@aU}%`r8H!rnsmP#Z_nU)ZOM|a77BIsbO*<s>%%VFv
z5+W0&4!kT2Wr0{UN~(y=S<^7jwysE7iDa9ZG}oGTcx)YcmWc<8H0Z-tQh4&>4AkkU
zC4gz%8mLDDjY(L-Vr6aTbhotBZIs(f3@k+>CE8XXWQ`JdMQz>8!#X}V#kGA&I}{!E
z;w+r4W0{5%mHMpzF0zJ0iKJzZ88`>$l0xFua9TbJM?y>8bk7T`=Nr)B@uCG6=vc1d
zgsIXEw2EK!#7JsrC~WCisi9aMkudRM1y+me*3iS5K*$24)uLdnfns>QSceWB>v>My
z7DoFlIxHO8ZP^Ac#0L5*F}Wh!%803GXhM$Lj8$Ih=rYia9=afCn>+cb?T{Gs2$U#&
zDG@T`o(J7t^kburi<vLE?T%>D8Wu>G;8GesYKBu*&ya>H3eA&}Io2W+bZICuBe7JJ
z#Lo#@gQ;YHEM>2aT9J_D!4@)RaXi+avZM6R&QR2Y%ZV}^OK^J|lO<w?qP-(#!lLJE
zGCXD?*74cum}v(ygjxnpfZ@TgxW!6JK6((MxnoqCq>f_jKtxA)Y7~tzNFoNJh!I09
zMW~gIIZVo4Mp%-3T4tn0#}$mR93KwNt5czH(6T*{lv>x*?_bl?)wQa-&EM=r94U!`
z(P^<i8Fh^PICdEr!*1az9#?6yWYz%vKWfQx99J3mFs`PZ$(SR0dj4b-dT}lG>e!Q4
zbn@&oaGfC4<6?3+>O~ViV&J2=fr9CQ5vfS34t03&F;NzZSbowa2X8iT3vQ(mtQTgO
zOw5|=n>@H(6r_@C=rj-RpsVA|U=Kb?d2ut5kU%KLUARZb-5LxP<1E$mWYEC9*vAXK
zJ>Bc3hOJZKTRixb$csru(C}#kw<F-C!#``_ew6~&u29m02Q?JNQ~d40=QT8q#!?A?
z)bht;sZndUpCJ50X2`bu3Da--!=^uOGgzNHz?Hbfp~!y7z#SM@Tx?>Dn!!=aPRJ#S
z9+Y?_^!(^#r%-oSvA9Zc(|Ai~I})=PG<``ku%pY2tMV)%`lx}&R4`h$Et&XL1CJ{=
z&@me&>%2(gh>pXo(2Ak}btW2x)G0OZYZ3=ja&t|XB&*CkYT!vcMcP^QlT0%Dj14On
zWzNaE4)Mm*2A&b_UEMt!yf}`p>v)cKE7dCh415F6Gs8oPO|hu8ij_h28@hw)H%TG*
zmVs~M1qKM&j5!6Kz@~vGu;ciyf$!n_P6mrb5=$L3PD<a<@S=eq;zyHJq&IAi(F3&|
ztZ@SSB?CVZ*abbTpzcs~i1}S4RCQ2ju?&=v@+O#WH_z{;B|Ih%fR1R;+QlWgl6^tQ
z#NnJzf~u)~b}T;GYZpxyy}V(DEv>99e;|9)KzQ)Vq-CN@9s@Tsb_gn0p7P!dM3JkO
zXVS4OCaQ9hN;W=u@JK7lkUr)8Q^;c3%eGJyO0-!fP1Hk)RbhszaQqJgZ%DA0NE7d}
z5(#sd5cJ68$lJ%_8nD_!^4=(MYV%St1s~vT7hh>bD3F&5M+MSR)t8M=efe%tU%qM7
zm-U<9a^9SSGM+Ez%*~k(6&ww4rGVec`osL|n!vpJh6&8CFRPe9&12jsz)AdBMRmYj
zUYx@YTfwGK$)8m?S?wtS@DrZ=s>CUTMqY6$PMo3eZpx7J?e&jizVEa&PM1L%i=RPL
zXMMvFoH>E>xO83`&GkpIVnD`+v1$Tsa!_VR&@R_JX>{fgo}y@|Cc61Vwg5H!eJU2>
zOyXZjoNI|LhqgU~wu1Y;_>e-&u08|p7On`|g`(ScQ3maTBj|I6Z41&E$bs<DIA9S$
zoK6sD5JGL9(uG-y7Ge{<A{1RV3q|KqrA9ekrF1hj<urH|oCa!GtR#yRp3F$raQXYn
z+d7N9M#^iNRo=Gum1oW(?<~q&Hmkfr1ZY7yF=t~?dxK-fvQ|ZV=aqRML}~p1NA7JB
zjj}d@prT^PAzgwXn03K?-w2o8t>bt}4mpw3>^_9;M-d<J*@uy=cBip3jVsf*rrP~H
z#;e@}&4p=P|1e?j*G>HEzP@VfmHaM#>y^Dv^Lsv)?Xmf7UqANxQhxiY3w<}HanpYE
zj-#KG+tj3a9P2pwxSGrzM>8j%P?H7YSR!~1;ZDLM8sC1ZA4k25NEg*NEKcLTan!hu
z;4|aQJPEG{GUoX{$3a6HU$|u9{`Z!O?_DYhhfvLNE7NcV1AHY;!zzYv8=uqdxB%<9
zvH_jwBE#JnVOYP2KKzo+?qytzS8*v`W48YVoAD;L;B9Qhzp)MPAfUMr)C_Fb%K2oj
zL|FN4nIybcH5suSeNj~(Sv!C)(T5k{7kC&4iLH~p>JcW98(${AlTbSMT`boAgUfU@
z@sGh@6>d+_J1BpLXA0yMF(U@<qnu*izANLy?j_HnX&=fC;VVm685DI_a@3#3p>y1o
z?jx9JF3kE{trl_GR!zS?agJW87u=6B**}D1WOE#?iz|!Lcy=Ee<XEMi#y6WiT&rdo
z`A$QnTXuioT==oNP@20fE^sRsw5!mKvDU;{39q0-Y$kbvDW76O?xZWm=#1SY`YH_K
zYD91icdq4Qau066UWVFrxDz)jiZ?q3Pg2bGnxU8@hhh(I#ZR%1)GR^_KV!*oQ_Bc`
zPU;J(Yk=-Gm^$rr_^&w9sc$}hjo%R8Z;4rogLD3OJTJ~U8}4^eqr>$cmcye%Q-6+g
zfurARtR+qF5tciDht~?^Q83+S*v=K{Mt)(+_i`qBbH#CfjgzFg>gCkOo2lUz*2h~(
z!)=NRzauA0g<ly<G+YrAr3mwVNOPoT*=jynl$m>UZ&9b~puk}ItBm{OK^_Jb8EkY;
z`Z&t(=Gr~{2mihF-+raMisC3Nqr8-}SMev_7QXm@A)PvWQjcF_C3N&Ra6^P^Im4vi
z0S_p7PD$1>@-)2u{udvb_2QqIt&YY<eno+b_(wT#y0WA7K;GrTtk%D>n>m+TGjtWz
zFPPHPomTRQii})mEXqibM}|BlL@{40Sy>K{5^`O$ABFCNu7iZ*5bVG?ln19IBTT4t
zL6d)?|1B$PwUP~1`!xQ(54vj{ZufL)hx4SB=1D6=LCH$N@+L-UUpW<I8w#_*>DoRO
on3H9d6*aGso}fbRNk+p{ynRfmaU#K&Wx$7jX5I#GDbC;iA0;UGGXMYp

literal 4683
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

diff --git a/bin/game/Match.class b/bin/game/Match.class
index 98ab6b563eef3e70c10d73e26a1968df1c3f8521..9c98df3be4d364a9a0eab8a0d22ab9e3c56d794a 100644
GIT binary patch
delta 411
zcmZXNT`$6M7>2KZnclpmhA1o4q*jW;lA$%E*)St7Gp4n%)>fKx<Fv`|#0T&Rbb=FK
z$C)!{HV<?3clPXluKT(h&Ijk+jkk1CE=DtzaxGV>7wgqjUKcbU-@0{CtEz>xu=V`6
z5R<NkU0+LS`~h(R)QcgZx2P|}y~k84UjB@0IL3o|hk7#pYqdU&TZXiaHcVLPz)2Uw
zbTdH@N$kwgOBM&4^sz@j#|%)y#RY@Z7~%@Ix@~{;`!F(!jWJ>U!Ug2#BPyOLLd*~*
zMMRyMo`W$unU<Y|n3A|<A;>(Fq$OQomL(QhW|fS}nwzc_ta95~6FMi(bw<cbV?%wI
guRYtcv?J**UJ8=#6XAe3hhjcb4NE~gRqvL-H`du;fB*mh

delta 400
zcmZXOUoV1j7>2L68ikhBMwGQE5?-Q03lm$&nm@DrUu&(Y?QNrRZjO=PNgu!`;Ka=4
z*w=C9%yaxYy`KBN?x*d2@IKuKYo(i#Zd983exqEkG}Cz#XuW*7Oz7=Oi)nsKZC1l=
zj;A#&wYd7WB+M=4v_6kGtCeQ9VHlNi^Ri)Rc*dh<gZi}o>%Q9dESVl`*m2;*i;H1;
znZQkwJ{Iw?A#|61iVSdpk1B)I8R8m0w*=H<$45AXl~KA0OFkmmF}a7(i803{DW*uH
zE2Hy08kd!X7?Wa4iD8K-8D>~!o)s2YW0fp9)>XmY^5y7aQ-0Z!^tL$jV%?EOLH*kA
f0td2mD6~kBW1%NZb4r{uv7f89<47y3A4lX5FFRT9

diff --git a/bin/game/PlayerTesteur.class b/bin/game/PlayerTesteur.class
index 4dd36d16e79dfe91fa2d32f67a3505027bbd8004..3a671e88f5ae28bc18edf130deecb9fdab2f2606 100644
GIT binary patch
delta 476
zcmZ9J%}x_x6o#K~rgqxtSYQf;5hyKxN(+uZ_ybio#t;k!NJ&iGO`1tlwVkF+jjp%`
zGiwt!1{Z8#F$)%6fEU7!jTc}zjL{f#k}oH3-se5%<olWZmN9?)I{OYhV&jwfwcheN
zzWXfb9J~ky{-9r9dYxfJk?OU(Et3Lc2BV6h|7;dT#-p67G#n-kZYT<Gy!W2l4&1Gs
z=O3DWFKh>0iz(6q_xkN_*a*Gm+x@=R^s|&G8_Xz%6X>1SZMlt)2ch4ws4yEHs<N7o
zzNqEOBDV}~{*%7@JF4${;$5N|U8wm?fn|#oZbyzbH&Wt`#a(6<dN2qx+>c&rdyc__
zKPkz$zdJ_fTCA=`pY_rqCumZzQniO;>?7>$TFk^L)An4<f__|$sl7TPzkP~p-%F&_
zae}1D;xNH9WmeHKC8nCZInr3tT_-P9WJp}2;v17wi*mv^H6e4bA*g;eorm%{2$JV9
dYbY_A(ydEZ7u_PYW#HsD4OUIjo`|OL^b!}gThjml

delta 621
zcmZXR%WhIp6o$Wj4&?xzax1hb&=vuE0X_9ndsADjVq;)nFdB_9A>@Sg0yJDq9N{Z8
zC-Dso4mz;|Of>NUj8Edwkpp8~U>!9pd+oK?{{Mfiz4iysPp|LWpU+=`6$(eb_b>M<
zuPau=?pWn!b>Hr6EW9uXDFU@h-L|%y_4cD?*Y37_1eq`yBch1R7tgSsdYDwW4tE>1
zAv9)ko(o4mQtkxP21zHRV#_nQMfk9_+vt=#mFoVJR;6ltNs%_Vs0fZk4=RnCResa%
z*maW(S?86SRdY^H<=qS93>KY_DyHYT?0i=lPY}ywiL1^pl@6u2ZgPXHLT`3E9&S2$
z?QwM2&Z^1Uu=rT@pxL$!Hk`LwEbiVLJxvih^B(7&Hc)P-q)+!$4qXg(z7TxA_=#|_
zkGrHF=fcqeQ+>jv{DAlgv*Akv<|RMi%CkQH(h1kX%l}g=eLN$eevC`hyqF{i5G5x2
z9C<9(#qMxd&N@E9+>_ROFfL%f_<-1i5F#?$C`l&CG9}c6kdrcnX;zsLiL{7hgq)=y
zx95hfV~qSQZjVaqg4jepL&owi8b@PGN^7F+KaG~8iLEse(qy?#liMN?$5S*&{6;ef
V?nvZ+Xt3@pNaPaL`vTE;@E4F?ZCn5V

diff --git a/bin/game/cards/CardRegistery.class b/bin/game/cards/CardRegistery.class
index e4e6b6aec3e8e1e598dbd2953d8fef1b81196808..694f6ba614696c241c01adc5ad692c3a7f6233fc 100644
GIT binary patch
literal 6967
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
QA_yv&_|KmIc<TQ9e^=}{+yDRo

literal 6778
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
SQd22D#XsmB!#_Q#&;Ab?*cod8

diff --git a/src/Serveur.java b/src/Serveur.java
index 1648a99..ae1f63f 100644
--- a/src/Serveur.java
+++ b/src/Serveur.java
@@ -4,6 +4,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
 
+import game.ComsJoueur;
 import game.Match;
 import game.PlayerTesteur;
 
@@ -16,7 +17,7 @@ public class Serveur {
 		ServerSocket tCPserver = null;
 		try {
 			tCPserver = new ServerSocket(port, 50, InetAddress.getByName(host));
-			tCPserver.setSoTimeout(250);// 250 de ping max
+			//tCPserver.setSoTimeout();
 		} catch (UnknownHostException e1) {// cette exception ne s'affichera jammais vu que l'on utilise localhost
 		} catch (IOException e1) {
 			System.err.println(
@@ -24,47 +25,53 @@ public class Serveur {
 			return;
 		}
 
-		// l'udp est un protocole plus rapide que le tcp si on a des probleme de latence
-		// voila une solution
-		// mais il est moin fiable
-		// DatagramSocket uDPServeur = new DatagramSocket(port);
-		// uDPServeur.setSoTimeout(500);//si au bout d'une demi-seconde on a pas de
-		// réponse alors le client est hs
-
 		System.out.println("server ready");
 
 		Socket joueur1EnAttente = null;
+		ComsJoueur joueur1Com = null;
 		Socket joueur2EnAttente = null;
+		ComsJoueur joueur2Com = null;
+		
 		while (true) {
 			if (joueur1EnAttente == null) {
 				try {
 					joueur1EnAttente = tCPserver.accept();
+					joueur1Com = new ComsJoueur(joueur1EnAttente);
 					System.out.println("joueur1 trouvé");
 				} catch (IOException e) {
 					joueur1EnAttente = null;
+					joueur1Com=null;
 				}
 			}
 			if (joueur2EnAttente == null) {
 				try {
 					joueur2EnAttente = tCPserver.accept();
+					joueur2Com = new ComsJoueur(joueur2EnAttente);
 					System.out.println("joueur2 trouvé");
 				} catch (IOException e) {
 					joueur2EnAttente = null;
+					joueur2Com=null;
 				}
 			}
-			if (joueur1EnAttente != null && joueur2EnAttente != null) {
+			if (joueur1EnAttente != null && joueur1Com != null && joueur2EnAttente != null && joueur2Com != null) {
 				try {
-					if (PlayerTesteur.playerTest(joueur1EnAttente)) {
-						if (PlayerTesteur.playerTest(joueur2EnAttente)) {
-							new Match(joueur1EnAttente, joueur2EnAttente);
+					if (PlayerTesteur.playerTest(joueur1Com)) {
+						if (PlayerTesteur.playerTest(joueur2Com)) {
+							new Match(joueur1Com,joueur2Com);
 							System.out.println("match lancé");
 						} else {
 							// le joueur est cassé donc on le retire de la file d'attente
+							System.out.println("j2 invalid");
+							joueur2EnAttente.close();
 							joueur2EnAttente = null;
+							joueur2Com=null;
 						}
 					} else {
 						// le joueur est cassé donc on le retire de la file d'attente
+						System.out.println("j1 invalid");
+						joueur1EnAttente.close();
 						joueur1EnAttente = null;
+						joueur1Com=null;
 					}
 
 				} catch (IOException e) {
diff --git a/src/game/Joueur.java b/src/game/Joueur.java
index e5e0a85..5a5dd44 100644
--- a/src/game/Joueur.java
+++ b/src/game/Joueur.java
@@ -1,7 +1,6 @@
 package game;
 
 import java.io.IOException;
-import java.net.Socket;
 
 import game.cards.Card;
 import game.cards.CardRegistery;
@@ -9,8 +8,6 @@ import game.deck.Deck;
 import game.deck.DeckRegistery;
 
 public class Joueur {
-
-	private Socket connection;
 	private ComsJoueur coms;
 	private Deck deck;
 	private Hand hand;
@@ -19,9 +16,8 @@ public class Joueur {
 	private int mana;
 
 	
-	public Joueur(Socket connectionJoueur) throws IOException {
-		connection=connectionJoueur;
-		coms = new ComsJoueur(connection);
+	public Joueur(ComsJoueur connectionJoueur) throws IOException {
+		coms=connectionJoueur;
 		pV =20;
 	}
 
@@ -75,13 +71,17 @@ public class Joueur {
 		//debut de l'écoude des action client
 		while(phaseActive)
 		{
-			String command = (String) coms.recieve();
+			String command;
+			command = (String) coms.recieve();
+
+			System.out.println("GOT COMMAND :"+command);
 			if(command != null)
 			{
 				switch (command) {
 				
 				case Command.PING:
 					coms.send(Command.PONG);
+					System.out.println("pong");
 					break;
 					
 				case Command.PASS_TURN:
@@ -91,6 +91,9 @@ public class Joueur {
 				case Command.PUT_CARD:
 					putCard(adversaire,board);
 					break;
+				case "time out":
+					System.exit(0);
+					break;
 					
 				default:
 					coms.send(Command.POPUP);
@@ -162,8 +165,8 @@ public class Joueur {
 		
 	}
 
-	public Socket getConnection() {
-		return connection;
+	public ComsJoueur getComs() {
+		return coms;
 	}
 	
 	public void setPV(int pV) {
diff --git a/src/game/Match.java b/src/game/Match.java
index 4ebabfc..901873c 100644
--- a/src/game/Match.java
+++ b/src/game/Match.java
@@ -1,23 +1,22 @@
 package game;
 
 import java.io.IOException;
-import java.net.Socket;
 
 public class Match extends Thread {
 	Joueur joueur1, joueur2;
 	int tour = 1;
 	private Board board;
 
-	public Match(Socket j1, Socket j2) throws IOException {
+	public Match(ComsJoueur joueur1Com, ComsJoueur joueur2Com) throws IOException {
 		super();
 		this.board=new Board();
 		// random j2/j1
 		if (Math.random() > 0.5F) {
-			joueur1 = new Joueur(j1);
-			joueur2 = new Joueur(j2);
+			joueur1 = new Joueur(joueur1Com);
+			joueur2 = new Joueur(joueur2Com);
 		} else {
-			joueur1 = new Joueur(j2);
-			joueur2 = new Joueur(j1);
+			joueur1 = new Joueur(joueur2Com);
+			joueur2 = new Joueur(joueur1Com);
 		}
 
 		joueur1.requestDataEarlyGameData();
@@ -47,7 +46,7 @@ public class Match extends Thread {
 	}
 
 	private void endGameAfterIssue() {
-		if(PlayerTesteur.playerTest(joueur1.getConnection()))
+		if(PlayerTesteur.playerTest(joueur1.getComs()))
 		{
 			try {
 				joueur1.win();
@@ -55,7 +54,7 @@ public class Match extends Thread {
 				e.printStackTrace();
 			}
 		}
-		if(PlayerTesteur.playerTest(joueur2.getConnection()))
+		if(PlayerTesteur.playerTest(joueur2.getComs()))
 		{
 			try {
 				joueur2.win();
diff --git a/src/game/PlayerTesteur.java b/src/game/PlayerTesteur.java
index 4c1f0b8..49a181c 100644
--- a/src/game/PlayerTesteur.java
+++ b/src/game/PlayerTesteur.java
@@ -1,20 +1,12 @@
 package game;
 
 import java.io.IOException;
-import java.net.Socket;
 
 public class PlayerTesteur {
 	
 	
-	public static boolean playerTest(Socket joueur)
+	public static boolean playerTest(ComsJoueur com)
 	{
-		ComsJoueur com;
-		try {
-			com = new ComsJoueur(joueur);
-		} catch (IOException e) {
-			return false;
-		}
-		
 		try {
 			com.send(Command.PING);
 		} catch (IOException e) {
@@ -30,12 +22,6 @@ public class PlayerTesteur {
 			System.out.println("le client a été trop long pour répondre ou une erreur reseau c'est porduite");
 			return false;
 		}
-		
-		try {
-			com.close();
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return false;
+		return true;
 	}
 }
diff --git a/src/game/cards/CardRegistery.java b/src/game/cards/CardRegistery.java
index d14c34a..e1a4ea5 100644
--- a/src/game/cards/CardRegistery.java
+++ b/src/game/cards/CardRegistery.java
@@ -97,7 +97,7 @@ import game.cards.Renaissance.Rennaissance_Vlad;
 public class CardRegistery {
     public static List<Class<? extends Card>> registry;
 
-    public CardRegistery()
+    private static void initCardRegistery()
     {
         registry = new ArrayList<>();
 
@@ -205,17 +205,25 @@ public class CardRegistery {
     }
 
     public static int get(Class<? extends Card> class1) {
+    	checkregistry();
         int a = registry.indexOf(class1);
         return a != -1 ? a : 0;
     }
 
     public static Class<? extends Card> get(int index) {
+    	checkregistry();
     	if(registry.size() <= index || index < 0) return null;
         return registry.get(index);
     }
 
 
     public static int get(Card card) {
+    	checkregistry();
         return get(card.getClass());
     }
+    
+    public static void checkregistry()
+    {
+    	if(registry == null)initCardRegistery();
+    }
 }
\ No newline at end of file