From b233b0650e6c76b549a87dd3206a9a2e1343fa3b Mon Sep 17 00:00:00 2001 From: Qweqker <60119671+Qweqker@users.noreply.github.com> Date: Mon, 20 Jan 2020 21:10:11 -0500 Subject: [PATCH] New Accounts will now automatically join the 2009Scape clan chat (#60) Renamed the Server's account to '2009Scape' within the members table of the global.sql database The automatic clan chat join can be toggled on or off on the Management Server's ServerConstants.java file Added some text in the TutorialCompletionDialogue.java file to simulate joining the clan once the player has reached the mainland. Added some comments along with my changes to properly denote what is happening. Added spawns for Melee Dummy and Magic Dummy in the Lumbridge Combat Hall in the server.sql database. --- .idea/workspace.xml | 286 ++++++------------ .../net/registry/AccountRegister$1.class | Bin 1369 -> 1369 bytes .../net/registry/AccountRegister$2.class | Bin 1697 -> 1697 bytes .../net/registry/AccountRegister.class | Bin 6401 -> 6574 bytes .../RS-2009/org/keldagrim/Management$1.class | Bin 1233 -> 1237 bytes .../RS-2009/org/keldagrim/Management$2.class | Bin 869 -> 873 bytes .../RS-2009/org/keldagrim/Management$3.class | Bin 1975 -> 1979 bytes .../RS-2009/org/keldagrim/Management$4.class | Bin 1541 -> 1538 bytes .../RS-2009/org/keldagrim/Management$5.class | Bin 1197 -> 1201 bytes .../RS-2009/org/keldagrim/Management$6.class | Bin 1061 -> 1065 bytes .../RS-2009/org/keldagrim/Management$7.class | Bin 873 -> 877 bytes .../RS-2009/org/keldagrim/Management$8.class | Bin 1623 -> 1620 bytes .../org/keldagrim/ServerConstants.class | Bin 1641 -> 1699 bytes .../net/packet/WorldPacketRepository.class | Bin 15277 -> 15279 bytes .../interaction/inter/GameInterface.class | Bin 7577 -> 7647 bytes .../plugin/tutorial/BasicStarter.class | Bin 2348 -> 2035 bytes .../tutorial/TutorialCompletionDialogue.class | Bin 11858 -> 13967 bytes .../src/org/keldagrim/ServerConstants.java | 7 +- Server/global.sql | 2 +- Server/server.sql | 2 + .../crandor/net/registry/AccountRegister.java | 11 +- .../tutorial/TutorialCompletionDialogue.java | 10 + 22 files changed, 118 insertions(+), 200 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 1933ec504..e801e8310 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -1,13 +1,30 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + - + + @@ -246,39 +154,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -288,12 +163,6 @@ - - @@ -315,28 +184,51 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$1.class b/CompiledServer/production/RS-2009/org/crandor/net/registry/AccountRegister$1.class index 21446516e14fcb904d4eb4943f26ffc7daf400ee..10001809cb312c1dbd21edf36e44188ff4e43cd7 100644 GIT binary patch delta 47 zcmcb~b(3pD4GW{se-NAwX<{LMAXItO@I6fe=Dih7bmoWD1iQ$pTpb5jxtc z*eY6`)>>CU3l-6VfguAGv5FSkYHe#vYioDAZ+1~DntpF42F~f}X-?+7`|i8=9yP<4EbO;%z=&TqMvob+gEk(=A%!O#T!JSpe8tR%&2YrQQ|M7R>L5NE#~dVa z+(9o=3MY*FNfYg>Mta&no-)!i3a1@Bi?2C&4$mu`aWDZd7?v+8eBD6+XARCvCg?XT zeAC4Fmcq*xHd}bb!nZBFYT-K;zH7LB&*t#jAbdZL9~g{tCe9Cy^dl+S_<1Z%KUmg4n zZ#noo{$cFjwD3=AJouNw+dW&QC`-LVb23gGc8!&H6R)^RTnhj0vE9eSbu(^BJnNac z@;#i_ScmsDK0u!qh$zX@;=(Q^ZY>`1QkTnLz2=Uk#m0HAb_k%wkwIECc4>SXpHY&n zWv~oMRC#m8t;0@%3RQ+GD?_D08Lni6mXUI)l2KYl zOHSfN@7NJzh$&+Y`Zy!y%4J$Uid|%!lX%&-61mEr@G&iUGG58$TCR`@g6wOfTcW|v z%`L(5XjjZ&Pc%b5V+FIuM@Ou!tE?s3rX?s- zG-6W7N@*#QsamG7L^54wXqhRqv=mE;mf42e9GNTd4}@LS+#2ibineajGEe54*bB6T zq*O_nmU5{O*hN#O6o=PGH^sCpBm#D$=?*1}v{cGsEmg8aOSM5>Dm7Y`$#TK4G<;ig zd$9Dnu2^YzV`HpC;TS%5ahGQLDVjX4eZA_u9t5Yzd zrlPKXd37jKv9i9rVqvJZdR2W{b*P4?zqaSyA^W9xHQU^UQCNcr1Z%m!cCeWg~XT?QD(vv0EO(opKy^r}N$iACt&IGp=O? zgRH|wN^U0PLklGj({j*C$xFKNHOwjk#SqIfE)29dj$sr*>I+)=gKzh-ME>n3*-Sl9aQ`&;9JeX}%uR(TRZoH3QN=q>(h3&>z z;d;Oh^kE42h3QxK;d0mmD+37zokm;!+rx(TvFI19M{;`yb}~!@O#>No$Po%zJPj~$ z`s4GaTyg01Li+E?C%ECJCeGgt{~zPtbjklW#El<9$Sg+9BKVnnx6k`D3L`FmQ8?m` z`=^E@9{;p(#Ot3Pjwt_(aK!S@3@0(GI^fPfisI84pM)oc5*GrV0mbZ$!h1pC@{LJi zPDZT;)N@mqM@MTwF+YU`RQS9n5sLI8UV0p5DU`eT=vBD)z!&f-|H3rN0c4wnF9Vsv zB0*gsg-YRLxY!ial`iHCb{y~k@7#kZ;R~|_53?wHc=&s96ZYXA?B~t_9K>U6kjHV7 z*XDUVkuKbD#M3qDFaAWrd=j5x>COG%yL2806>hR|;Zz*(wV^=+4H{Wc7v~(`hF(-H zEeIsB+%bdSb7>YNi4f?=zg9n$iRzZ?1Usn<2X6Qf!qwphqsljb2D}^gqN*z zYx=g@=1uAkTEU=(bM{kMo}a{uYDQgoh>FbBGVeF|0kH5)e}-w}bd!Nv4{pQlgc5$Q z@8B43p!wvqf)}qB;ll$^nOk}$4U@TH?o6G07VaD5V8MpH_lgC3i}&ruP0sOn%*nntZ~n~Onfqq`f3WkiPT^yJ?K=P< zTSnV(Afm9=!p# za-Wg*D?DuD5gf4bC=Mz-X5(x;Zn8Y2@PrLNo-}a|8_**bo-#N`6^>a5S$NvQGZvn; z@SI8PxQEO0_3#2-w8ISWk^y4QJ1aRM#GHF2fa(<4N7de2-HaHJO9_zTrqfKxmz;jTr*p~Z>i8du?JB`z&V;ufSvcGgdAX~HfNsGQuK+}xaWElMmc z9-LBQYpEwXGErp?&!U+mE2*y~MZ8KHXz@uyLDS-rX@Myv!O+y=l0c}iEHJP*R9Y4c zm6d8ajfm37U^g~Wsx;Bk6w6sp^T>8bN`{hVTGFJslGC-ckTV3yGlKJjfzr9N0)v8O zg$6R+EG?NrAbGr;sil>8wX_y@WP@twRMIALMCF9Fw3V|oCd=7M+G)uUzm`lAChetz zmVk8Bk|mwAbT+wUOBaDJ0d)TK*@aAa_8cu;rJF(PuBC_c)Y6OAxCYlM>8+)Y^wrW& z`fJHCK?cY`ErVpRpy7;QWQ%T)t?;duAu?2>02eCB)mR~UN``3}E+Ygfx9S<-x*ylj_Dj++annrFp*MYMgZz# z5`x@~G#OLq;lWfC8qbRLzM~R0u7^1xKzFo8PqafX1kf8@(1%iA3_w2&Mh?LSAcTRK zhe23~A-EhvIT*PpM;^9vFm^Jv-At;AmIp8ahj1~DGLaXUz-vt5O@e<<=${GxCyK<2 zX_AUd!qN;gq%~%WAG4$bLedq*(g$;-KT2dUN@W>x;mc3XLt9vuNETTDzFpUfb$ipR+Tr9|o>6DUKmW>&d+)On*4l_xyBE;yp z3xV?DE`;hEcOhW+8keIufmw96Sj{%frmu(fl#`naU^5{fidktrKq@f@a}D#9O6b9P zrBsSCUd%kI$050OdbpY|I!m!Og$2e~kzIKF)kuLep{_<-coHWQ5(H&qF66(bVS{QC zUTfWik1xd{!c3s4KW+}$Nx{Ke0Sl);)*8CP(6NKm^vPmAa8a{_zoq{lV_l5${|<3k zBE+vmH4Ryw;j$hhNb+Up7r1?0@(Yx&Ykm~nM)+MByV3n1+C-65 zg&t1$lM;%aafQ29;q;y!MX$J8CDgsE(1(szLeaMh{iyJ|_oIJ7C35y+Ko!CRsj9*t z&Kx%meI2?N7^8#`ve(C@sTsLb%!bSH`-{V?GWwpo0l&?jd;>MrK429yNlfqqk8L z?+x<_1@^GNqjgG3j!g-uO~MMSWGpf7&zhJWVrMo^CC=HAh!pR#hwF5RD^85p!gc?U z5auf`|2#nP^im1to#8!XOdOYY{+<2$z!=T%^&VNUAwdt35! a19c8w+nU&Z6V7i;!AF&u5>sAUeE%B`)v5yk diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Management$1.class b/CompiledServer/production/RS-2009/org/keldagrim/Management$1.class index b9d912d7987c0a7e1053cbbcae91cc8f17461822..1f5575ee22abff375ba1693b34310e31b0b560f4 100644 GIT binary patch delta 25 hcmcb}d6jd*Jyw>y#N5=055-woGV{{%H~zlH3;>1F3X}i< delta 25 hcmcc0d69F%JvOEa14ag+$&Sn-%uE%A8~Tz?O2 delta 40 vcmaFK_LObHep#jp14afRpRB~PME#t^ymbBGlA_GKbZbTirV7K24?39u7Lg5X diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Management$3.class b/CompiledServer/production/RS-2009/org/keldagrim/Management$3.class index b19668254cc5f6b3815334652a5bf1370c5ca10a..1555fdaa079ddaf557f0154795e63bd6fad01d26 100644 GIT binary patch delta 28 jcmdnazng!9EF&vRUSe+QWCccXR+h}XwEWFhjJ0e4cxeav delta 42 xcmdnZzny=BETb$_g#jajkWW@(S)zVUVqUs_a7j^SUb;0S15<_JW;@1OHUI^i3;F;6 diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Management$4.class b/CompiledServer/production/RS-2009/org/keldagrim/Management$4.class index 7e77402667577e9d58e78c2e8091deebc2fff11f..ce57e7b36bb1bc229fac9a256cd28143d03cfde8 100644 GIT binary patch delta 387 zcmZ9I$xZ@M5Jk^}j<0E-iL)_AgK<_A=NU&FP!#70HXT8NK`#--+sIl{aOYU3HID-Uvq4q1IeM{h+{$3UpcAoiwMk6@V@Be(-Cj2;)GK@cP0pgg7#%8 zSI$Hf=Uiwt`R4c%{%9+0_y}-8CtdjI_TE^D_#!0fk@R{}pC|d~XTU>)ke6G$un^RF G2<8tRvP4q= delta 310 zcmWlUNlF7z6h+UkD*ctp7eteQh#`W#r6wl!CK`>#K8bx32SG9rY(PZfRB!?ELEMKk z2QI)(xCR%X_-pX);hsBsPwH7!zy3Zxfehy!5k@`6NQOu;E=hYhWLzc!PP$A5oc5Su z)@9CR-XlvckP9x0LCFVY$z@qmkgU8^-vsu7nTl?)I>Ni`N%j>79O{(S)m>B^ zaUAR?f{>r6UEE(j)U%3H&H`I~zqLwsp@%pYA!B>#!=~SS9!C7)O9mu^MhzKdF^q5M OFk-UPoQI&@5Zr&ZGc4Hv diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Management$5.class b/CompiledServer/production/RS-2009/org/keldagrim/Management$5.class index 2011fb2cc2cd55641c9b60bacfb48c0e7b560c35..8f3dd6fa7e4b786388dca3746d14126b862af281 100644 GIT binary patch delta 44 zcmZ3>xsh|iK}D9l#N1Ry1|grU#Ii*FoW#6z{os14afRpRB~PME#t^ymbBGlA_GKbZbTirV7K2kIpj#00%w|O#lD@ diff --git a/CompiledServer/production/RS-2009/org/keldagrim/Management$6.class b/CompiledServer/production/RS-2009/org/keldagrim/Management$6.class index 3573686a33ab4f31baae43741a1871f3e9ff3e4b..141c84fc50bd24c3e3ecdc23db5cb2497411d53a 100644 GIT binary patch delta 44 zcmZ3=v65rLc14!F#N1Ry1|grU#Ii*FoW#6z{osgc_P}pu4y7H z+0bmVCE3>Okn+AoM`l+b)A#u&x9n*4*cXJI$9%;pma0zKy(?6zZrQ!*)EtnOWHg5y znOV&-SxHWF!l~p;bIyh4lB<`L@76P@Es^3&T1{gH7 O7&6{!q!2V1g8dKhpfJn; delta 330 zcmWlV%Su8~6o$WjGWO}XAu0)iiqrjOnQ2$cvh04-E_N>tbP&T%pi=f0g_GW+S%b#W zIEWsmXgm1V$NE^T!T+VcRp#^W?H!16Wzk5`VwjOSLX1kn7Cy#IB2`9B#;csLm}JUg zni-22vwr4?SJ!!y1(SqiQL^-$d1*7sqk_h*8|U5$ZNb`!KiGXBPvBtV&L$S$Lt=M5#5U?MdqV3(4 z?1G!k6-#cxz3xz?NK5t<`yA-EibFDzBgHW%l2gSQ=ZXt1U)PL}nq()f7}V*jF1o3q hN4Mce{1TM(O8T_w*UDgkK}{b+dba3T2pTlO{0D`=HR1pO diff --git a/CompiledServer/production/RS-2009/org/keldagrim/ServerConstants.class b/CompiledServer/production/RS-2009/org/keldagrim/ServerConstants.class index 5055552abcc6530c31549a94f0e64c057dafee74..027a873702857f126abe28a76652097ac8c47e6f 100644 GIT binary patch delta 759 zcmYk3+fEZ<6otQkhIS52K}P`r>nVzYoCHx&Kual7tu4@UC?0Al6;T8OM&lLFKpHQ+ z_QGpug2n_Nz$fq(d&F7{Pk!)-xHy)da%qB9qXd;qSs6~aF&ZK5yxv5BI(&owTpMt8NR@lRZwbk|2 zx1$zMOY25k{2F~8opcHJ$Z34$k!Q)HppP~#E3A#J?)CiZqQ$aDQOnO+QJC}bq{jlpq+i2)1(ih=+xrsp4mapX2<|`wPM^R^7jZqvK1jX0BA}?ZP{%`dlrF zARDL{Wq=AwVnI`4$b#e({lfYMm0+ObD{5B?L;f|mg2?}@A;o}H-l2&b+!W?8$dGPO zdLQWA*8Vza3k%}UVzXGe(^%=z%B@NaWbWIQ#KYpWG3`*)VnnLZqc9)jzJ4anGC|+^ zhP{vDyZh9B!r8<8LU0eSj1fE_lr{ajbhgG%)u*!o|5&=r@xY<%Yx#r-C;t!RS6a8r ZIVcMrkwK#9AQnc;n8h8L=B`kK$UlJ8V!;3a delta 694 zcmYk2+fEZv6o$X)(9Z5SfQ(ozpkP$gTCuiNtzzYTQVw@^Q86v4QPn zmoiiN<+1FnB3J7-ibm&xff^~6w|BPRq%EFQE55 zm6h=Z;;~q&_RdTh2i>wg*n|mj3WL)^KA|u@^ftLq_)H6*74B!C`Td;m`Ii0*!WUb3 zQ20_y|7Bs>6j?8f_?1V)+Mq;Jo|iu%qhmq|iH1afKA|XK-YK3Sn#Aii(;kT6ROYX<(Bp#roe&FzGEGs+~5)R2ZD!~p9vgttcEY}6DMc7?Ov|U?eKE`8Mo7`aopcXcj>e%i4*^q aX_!mUCkEoA(FQDhp>c~5+2Wp{kMuu+;Zw8# diff --git a/CompiledServer/production/RS-2009/org/keldagrim/net/packet/WorldPacketRepository.class b/CompiledServer/production/RS-2009/org/keldagrim/net/packet/WorldPacketRepository.class index 9af9c45cba70e2ee81741d255a7d3a6ad02a3a43..8f40b7c26dcf1247e771e0276c30a731fd9e1139 100644 GIT binary patch delta 28 kcmZ2mzP^0JZb3$)$$JD9IgJbqEQ6C13sN^f5j?300HK}=)c^nh delta 26 icmZ2qzP5bBZb3$a$$JD9*@J==j0_AcH$M|RsR;m!=LxI; diff --git a/CompiledServer/production/RS-2009/plugin/interaction/inter/GameInterface.class b/CompiledServer/production/RS-2009/plugin/interaction/inter/GameInterface.class index 29ba678193dd35df3e5fe86971f7dfad0cfa1bfd..dd812ceedbebde82a9d77a3540a999e66f6d82d8 100644 GIT binary patch delta 786 zcmY+CTS!z<6o&t`w&OV3D9oXP)NW937CnVo1VI!Lflpb~n(?UvAOFAC+WV}v&spd5KIGkPaJeke zup$;v-mDPRErcJHYqq&&+QtC>AuGFi)z#w9mqfha6b=b4;gXOfJQ6&@DZm!2+Zo(06#Zhj@2@c>SAIB*^i_?4$JsiS0 zeu!Qk$3^~#KAu3oioq2XkLxM{H&r@rs~p@>`4~`3FoPiR7F58$ z1~#aT~-%MO=+IOT_uaMWa@ZFTkuE zM>Hiy(QmlO9yf`Au20uAeGFL8|W` DnH`nx delta 730 zcmYk4OGuPq6o#Mk{iEZklcP3c)1S0Z>@s34QUfC=&4P?@%=;xx(N$?FmbGXCEjO0X zFHuBg6eJZ9SvD1c1Qjh>bODL5R<(8jzrJt+G(L zPPs?9UU^6vQjRL~m6OUc<(#rY`Bm8y|M$Cnr4uq9nkFUP`eRL#S`hMutr*^$64hdO zLI(dUhJ4%p)jIud*Mzi&5~hA;wTV|}AgW8Mbf-O7YZ<~$EEtMzk>zX^n^MUmEE}ni zVs=OwJ7qVOQq68@rb;@9$U&;*C^a%ft&CA8SE$$A4KhWe#AuSIw8?YYot_?M!QMYkSnPoLXyTz zpqjmSbZikd)arF(MN`=xKk@jzQ%8OLl+-oo60_tQwb5E~P3l}ru325el50_yNUJU{ zAZK%CqGY(_Hv#dcEYfe=%j`wUZEtdx$F?`Qa~F{Gcu%G!8e<=Ah|_2H2JdUgNBS;e z6zj_=^QZGV=>#cn{r+POT+pIsDAPtGN>l`B!u!tLm=v5XaoRU2zq7jViY;rMNI zqDw$K+_TXJyL@bX7m*;?1VLOeCDVzIIU(HrJS7>0Qk_SL2PPT<+*>>`iXd~lR)7$~ zJPGvYu|_j5Nk54j>7F$Ob|$XvyimXDg>y-lZ#6q?)Q|nrfIXYrh-i VSd_JKOfUwSO)@&HcJr9R^e+~^FlGP% delta 846 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 delta 4472 zcma)9d3+RA68@@>={KDY%nacQ2^o$+7=(bJB8Q-$90Gy?V?4kZ#t;Yzkc5DW!zqG* zXd|a6Q8Wl1kU$ef6pwXPTo3SC#rwpA1r>FTn61~{0sQU$u|Mcn^}SbB?|W629UCh%`*@w*)A1^y67oD}#|pur%RxCl=PB9^2GQl->Pj3S+bP(Thw zkfD%T&>+*KB(h9OrY3@#3JM7d3yKJ8CMZQvb3rWxwG`A!P-{V{g4zg5lfLPK+6u}r zDN5}Ug4zq}Ag4Q;lu4bW*4dye6NS{pq!@MObkkXKx|>PeDVsA#JtXXD(%GKY%cS0{ z@#;C8X*yS~o+qe}N#|2vgZi1Ml(Bld8K?dR4Up6?kY<+*G-(iBD2Izo8cah3U2I|@ zU1HEsDTf&}Tm~LtVliDRXr!P~f<{Xcml-sM6G>wYy4?-zAba$f!4{3DD=f;TD=plM`z*?%t1P;jAzee) z+I<6UlO|X+k*>2SAKUDLz&)uG>3WL_Xp%v3i*CSH3wL6bMTIokZf#6xUqn+Zno7kM zO`{TnN-dgBGc1~kwFZ@0R8AH4dSg;xmPM5`+g8Ogbq?KV4^FP4-u9Qty{Nl=P~2kQ zB?hSD=_Y$uFtdMJPP}ANbXq)GUK%Z*9FI=RFDfa{=c$s?%I*X!cXDYoe`Y*7r?g@q zK@`m_Eg4lhiOJnebM3E#qr@$g;L~xm{^qQ1^JqRH5S_*r-7Q)`3oTkii!Hj9mRNKf zEwyMF-EPrxT0!V-?`+@2-jSXZGH9hmchD+>?zHGGY_dBf_3hLtue2gsSyWscEuWb` zD_$HeD)}E2Yd0osB71vivue{qdvrLXt3j(Rx|MfcMK25qtEL9Qx2B!_C+YS6LhqVmhMT5_R=mww4!9IEM9&^QM@ufXDp zMO2EZr|Hp*L?b_%fh~BDc|F8bnj)!LpR~++l(tHyc1k;*uEthLn)95(>DK@wH?|7_ z2S(WZ{ysz)h&luvn4zIn`bP|#Zs$l`fwy@GH#9W-$#ONz29~w_aH=Rd!3x)cda^Xw zxQ=BD#?m*7vv0TD3g(X*6 z+rjb>6HAJ8)c3*4QzMx+X=SNmC&DV!XkFZ)phUb%&lcz(I7ZJK%12R={)ZCSAKr*KGFc9Mh$f)~njv ze*77mr~3MNF`sD<>DrUM&d!a6>4g1emsSZGq)Bcpl;wsQEw|z)P=j`ww_h*cpujcg z=5g_l(OU*QM{;38fxi&a*ib~yb#R`m^pT2xg7c+UU+L8^C*h!fERXA~T_@wKucd8c z))V-V=~MY>&5tbX@R(2Nd?qwN9^iNBfgX+Xef@bQ;?B2fobTt)YdhQ>iro`j;B!eE zD9H?xWG-a8&S!ENY%5(mCN9d`gTav@4lYj9HuI4NRzr^rVi>uE2M0shjq~ZAwhqJ6 z&UTn;Sn+Dv>;KDwOhTA`k^Gd$q>Fkt|<sQ!-&F3xw|chzH=ACEB{4@qy1gd* z#-!V1iI>WkV42;fN0ENJz6ICX+d8$;xVco?TYFTQrx#!^aP8QqGNv=pnT3U^X9 zR?{}Dq35ucUcx#$fDQCLHqvq2LqGHV?j-I@C;@C%(ov;!#{EhRTa+PqNVy!2Pwctk13W6A09|!Poj2e52>$h+cqi^||;?UxFX>6*#J|#xZ>>j_Wn}QQw`w&-#9x&|k(c`kVNb ze=>j5-^1_vVbtp%A#X1h>{){L`GmDiNGWZ1_~)DFqN!81vL%Krf^^# zH48jRDS?-$dEhX$2-H(cL#0&1pf*OB(v1|#Fj`U6XipuCOv*Hd@E=Wyq145=lw!ts z%64xDF=))L2Oh>Y*~yLE#%ls=+j)*VJZq1zrnnb|GW1HT$J(}OU6Yj#scGp-H0zw! zEnB82S*Z>DLa7EGC4$bvz+?QM3_RYzQT&C0fxoO6*wHy#>7UW1T|L>>ABgf#efvOj z%F5`JtYp+*w7cl;F?eqmO$73yEOBO1y1S?rE#w89&bWX_xzlvwa_r%G1$B6WrL60dz<&V6whVRv diff --git a/Management-Server/src/org/keldagrim/ServerConstants.java b/Management-Server/src/org/keldagrim/ServerConstants.java index 54a1de28d..f0abe3af7 100644 --- a/Management-Server/src/org/keldagrim/ServerConstants.java +++ b/Management-Server/src/org/keldagrim/ServerConstants.java @@ -13,7 +13,7 @@ public final class ServerConstants { /** * The port to be used for communications. */ - public static final String SERVER_NAME = "RS 2009"; + public static final String SERVER_NAME = "2009Scape"; /** * The port to be used for communications. @@ -35,6 +35,11 @@ public final class ServerConstants { */ public static final String HOST_ADDRESS = "127.0.0.1"; + /** + * The setting that determines whether new accounts created will automatically join the Server's default clan chat. + */ + public static boolean NEW_PLAYER_DEFAULT_CLAN = false; + /** * The store path. */ diff --git a/Server/global.sql b/Server/global.sql index 59aa8b4c2..86631864c 100644 --- a/Server/global.sql +++ b/Server/global.sql @@ -132,7 +132,7 @@ CREATE TABLE `members` ( -- INSERT INTO `members` (`UID`, `email`, `username`, `password`, `salt`, `rights`, `email_activated`, `lastActive`, `donatorType`, `donationTotal`, `credits`, `icon`, `perks`, `ip`, `mac`, `serial`, `computerName`, `monthlyVotes`, `netWorth`, `forumUID`, `ironManMode`, `bank`, `inventory`, `equipment`, `ge`, `muteTime`, `banTime`, `profileImage`, `contacts`, `blocked`, `clanName`, `currentClan`, `clanReqs`, `disconnectTime`, `lastWorld`, `chatSettings`, `timePlayed`, `lastLogin`, `lastGameIp`, `countryCode`, `birthday`, `online`, `signature`, `joined_date`, `posts`) VALUES -(0, '', 'rs_2009', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u1UlfVkMYIS7WWbxsjjeyfxqTDbygpEe', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u', 2, 0, '2019-11-06 00:29:03', 0, 0.00, 0, 0, '', '127.0.0.1', NULL, NULL, 'SERVER', 0, 0, -1, 'STANDARD', NULL, NULL, NULL, NULL, -1, -1, '', '', '', 'Rs 2009', 'rs_2009', '0,0,8,9', 1572999889084, 1, '0,0,0', NULL, 1572999890885, '127.0.0.1', 0, NULL, 0, NULL, NULL, 0); +(0, '', '2009Scape', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u1UlfVkMYIS7WWbxsjjeyfxqTDbygpEe', '$2a$12$P0OU2A5S.lEYdkTq5kq3/u', 2, 0, '2019-11-06 00:29:03', 0, 0.00, 0, 0, '', '127.0.0.1', NULL, NULL, 'SERVER', 0, 0, -1, 'STANDARD', NULL, NULL, NULL, NULL, -1, -1, '', '', '', '2009Scape', '2009Scape', '0,0,8,9', 1572999889084, 1, '0,0,0', NULL, 1572999890885, '127.0.0.1', 0, NULL, 0, NULL, NULL, 0); -- -------------------------------------------------------- diff --git a/Server/server.sql b/Server/server.sql index 8671d96a9..28306e248 100644 --- a/Server/server.sql +++ b/Server/server.sql @@ -19623,6 +19623,8 @@ CREATE TABLE `npc_spawns` ( -- INSERT INTO `npc_spawns` (`npc_id`, `loc_data`) VALUES +(4474,'{3214,3252,0,0,0}-{3214,3253,0,0,0}-{3214,3254,0,0,0}'); +(7891,'{3207,3250,0,0,0}-{3208,3250,0,0,0}-{3209,3250,0,0.0}'); (4400, '{3018,10313,0,1,4}-{3016,10315,0,1,4}-{3018,10322,0,1,4}-{3024,10326,0,1,3}-{3030,10332,0,1,4}-{3029,10337,0,1,6}-{3034,10342,0,1,3}-{2072,5200,0,1,7}-{2130,5267,0,1,7}-{2140,5252,0,1,5}-{2141,5252,0,1,1}-{2142,5252,0,1,0}-{2148,5255,0,1,3}-{2125,5270,0,1,1}-{2148,5257,0,1,1}-{2117,5274,0,1,4}-{2146,5307,0,1,2}-{2145,5305,0,1,5}-{2152,5307,0,1,4}-{2148,5252,0,1,0}-{2142,5262,0,1,3}-{2124,5275,0,1,4}-{2121,5276,0,1,3}-{2148,5304,0,1,0}-{2146,5305,0,1,5}-{2148,5304,0,1,1}-{2151,5304,0,1,6}-{2145,5306,0,1,3}-{2134,5272,0,1,6}'), (1, '{3222,3221,0,1,3}-{2804,3427,0,1,2}-{3285,3208,0,1,4}-{3093,3509,0,1,3}-{3098,3508,0,1,7}-{3096,3510,0,1,3}-{3017,3239,0,1,2}-{2712,3484,0,1,4}-{2693,3495,0,1,1}-{3237,3404,0,1,6}-{3237,3408,0,1,0}-{3247,3396,0,1,3}-{3263,3403,0,1,3}-{3210,3223,1,1,4}-{3230,3208,0,1,1}'), (4401, '{2124,5273,0,1,1}-{2072,5200,0,1,6}-{2128,5270,0,1,4}-{2117,5274,0,1,3}-{2154,5273,0,1,3}-{2167,5259,0,1,6}-{2170,5257,0,1,1}-{2170,5256,0,1,0}-{2171,5256,0,1,4}-{2167,5256,0,1,3}-{2153,5273,0,1,3}-{2153,5270,0,1,1}-{2171,5255,0,1,2}-{2168,5250,0,1,4}-{2168,5251,0,1,3}-{2131,5264,0,1,6}-{2096,5248,0,1,6}-{2157,5272,0,1,6}-{2150,5268,0,1,0}-{2133,5272,0,1,2}-{2157,5274,0,1,1}-{2156,5270,0,1,3}-{2154,5271,0,1,5}'), diff --git a/Server/src/org/crandor/net/registry/AccountRegister.java b/Server/src/org/crandor/net/registry/AccountRegister.java index 3061ee427..2d56a0e8f 100644 --- a/Server/src/org/crandor/net/registry/AccountRegister.java +++ b/Server/src/org/crandor/net/registry/AccountRegister.java @@ -9,6 +9,7 @@ import org.crandor.game.system.task.TaskExecutor; import org.crandor.net.Constants; import org.crandor.net.IoSession; import org.crandor.net.event.LoginReadEvent; +import org.keldagrim.ServerConstants; import java.nio.ByteBuffer; import java.sql.*; @@ -152,13 +153,21 @@ public class AccountRegister extends SQLEntryHandler { @Override public void save() throws SQLException { - PreparedStatement statement = getWritingStatement(true, "password", "salt", "birthday", "countryCode", "joined_date"); + PreparedStatement statement = getWritingStatement(true, "password", "salt", "birthday", "countryCode", "joined_date","currentClan"); statement.setString(1, entry.getUsername()); statement.setString(2, entry.getPassword()); statement.setString(3, entry.getPassword().substring(0, 29)); statement.setDate(4, entry.getBirth()); statement.setInt(5, entry.getCountry()); statement.setTimestamp(6, new Timestamp(System.currentTimeMillis())); + + //If the management server's settings register new users with the server's clan chat + //I believe if there was no entry there would be errors during the registration, hence a null entry if the setting is off + if (ServerConstants.NEW_PLAYER_DEFAULT_CLAN == true){ + statement.setString(7,"2009Scape"); + }else{ + statement.setString(7,null); + } statement.executeUpdate(); SQLManager.close(statement.getConnection()); } diff --git a/Server/src/plugin/tutorial/TutorialCompletionDialogue.java b/Server/src/plugin/tutorial/TutorialCompletionDialogue.java index fcceced92..427bd3f27 100644 --- a/Server/src/plugin/tutorial/TutorialCompletionDialogue.java +++ b/Server/src/plugin/tutorial/TutorialCompletionDialogue.java @@ -16,6 +16,8 @@ import org.crandor.game.world.map.Location; import org.crandor.game.world.repository.Repository; import org.crandor.net.amsc.MSPacketRepository; import org.crandor.net.amsc.WorldCommunicator; +import org.keldagrim.ServerConstants; +import org.runite.GameSetting; /** * Handles the tutorial completition dialogue (skippy, magic instructor) @@ -305,6 +307,14 @@ public class TutorialCompletionDialogue extends DialoguePlugin { //Appending the welcome message and some other stuff player.getPacketDispatch().sendMessage("Welcome to " + GameWorld.getName() + "."); + + //If the management server's settings register new users with the server's clan chat, we would have to simulate joining a clan + if (ServerConstants.NEW_PLAYER_DEFAULT_CLAN == true) { + player.getPacketDispatch().sendMessage("Attempting to join channel...:clan:"); + player.getPacketDispatch().sendMessage("Now talking in clan channel " + ServerConstants.SERVER_NAME + ":clan:"); + player.getPacketDispatch().sendMessage("To talk, start each line of chat with the / symbol.:clan:"); + } + player.unlock(); TutorialSession.getExtension(player).setStage(TutorialSession.MAX_STAGE + 1); if (player.getIronmanManager().isIronman() && player.getSettings().isAcceptAid()) {