From b327e34f8e15312b8ce59387fb66e8c7619076c9 Mon Sep 17 00:00:00 2001 From: Ben Maher Date: Sun, 6 Oct 2019 00:57:59 +0100 Subject: [PATCH] Local debugging accounts fix (#13) * Revised shop re-stocking interval. * Revised shop re-stocking interval. * Updated character save directory. * Renamed new player save directory from accounts to characters. --- .../src/redone/game/players/PlayerSave.java | 18 ++++++------------ .../redone/game/shops/ShopHandler.class | Bin 4787 -> 4783 bytes 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/2006Redone Server/src/redone/game/players/PlayerSave.java b/2006Redone Server/src/redone/game/players/PlayerSave.java index ec7a8871..099c46f6 100644 --- a/2006Redone Server/src/redone/game/players/PlayerSave.java +++ b/2006Redone Server/src/redone/game/players/PlayerSave.java @@ -1,11 +1,6 @@ package redone.game.players; -import java.io.BufferedReader; -import java.io.BufferedWriter; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.FileWriter; -import java.io.IOException; +import java.io.*; import redone.util.Misc; @@ -18,8 +13,7 @@ public class PlayerSave { return loadPlayerInfo(player, playerName, playerPass, true); } - public static int loadPlayerInfo(Client player, String playerName, String playerPass, boolean doRealLogin) - { + public static int loadPlayerInfo(Client player, String playerName, String playerPass, boolean doRealLogin) { String line = ""; String token = ""; String token2 = ""; @@ -30,8 +24,7 @@ public class PlayerSave { boolean File1 = false; try { - characterfile = new BufferedReader(new FileReader( - "./data/characters/" + playerName + ".txt")); + characterfile = new BufferedReader(new FileReader(System.getProperty("user.dir") + "/data/characters/" + player.playerName + ".txt")); File1 = true; } catch (FileNotFoundException fileex1) { } @@ -505,8 +498,9 @@ public class PlayerSave { BufferedWriter characterfile = null; try { - characterfile = new BufferedWriter(new FileWriter( - "./data/characters/" + player.playerName + ".txt")); + String filePath = System.getProperty("user.dir") + "/data/characters/" + player.playerName + ".txt"; + new File(filePath).getParentFile().mkdir(); + characterfile = new BufferedWriter(new FileWriter(filePath)); /* ACCOUNT */ characterfile.write("[ACCOUNT]", 0, 9); diff --git a/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class b/CompiledServer/production/2006rebotted/redone/game/shops/ShopHandler.class index c0e2b7a4e22a2504764299ea2942850b91068592..38c0d4bfd3d89b97401aff63af9f8041ab6210af 100644 GIT binary patch delta 2335 zcmb7FYjjgZ5dJpzCijusS0F%0Qp!`Upj@ zQnUpM8kGu?Kw2o2HwvhTAP9n@;OqFug zBP`sGF&2s#iW$bDPyiNg!%zWZe#P8*^K+(^&#>?SW?2}{D@HNg%3elt`~wya;!_KE zV4Q_}aIb}7Y@3d94WC&!gu@z+w72j%$}D`rrY~7Kim$?ds!g&TeVa2x4BC-gyHd;AF^Xx2%px!9+rn zLI8c~lKWv2y76tx1t^urESzLThJQhsjqfYEjkzR}}5Y+Glzc(pdxAFIiE8(TS;3bJWtJgmX2?N|BnMSkr)z zt2lzJw&3oyXqWBt*P}y1m6*yqlYS}{5xF$dTZQ53VA^BHrdkAv{J94akh}$*s?aql zdVFi(ma@7Pou%N5!z-QaSMn=uBGRJ&wK_|bQyfcMrdI;{P{3%dH zhP*vWvgnY!J)3BcX(*#)P7Uw0dKJ*);KY)br=Zdrpa*5ao9m<9m(l52%&A63LQ;yd zy}o*=tvkp{@lI>48d{l*!P1Om)$~9GNj6zEbeG*pq!*tIIgJ8xNDtiu#Zi*+nA7B# zjqbD9Q}fJkNtm%w5Wg3 z(c3j3j=U=D@i>&+2HcouMq#*3k3$XRx^8j}B+uic&{$(Hn$*!^`7|<;YCSPE;nV(KWq5I#e`-)}E`>8VC<1%X zY|W(}G}SyU(z3bDWGHo1%9&I!!_bR5Nf}*lwup;H(L}sk92AF$kBO7wG_t93CWik` z`$M*^mDIF`qZ4Lh4)vg!=zs??7ls%}GB+@%aALJA7E>IdmGj6--&wLhL{@_y$hp>{ zBI#kwrxH@c89YJ~wLx(TkCLRo6vy!xNh(ssQ7jLogpLH$z0(^vnV5gHbPAmkaTVNu5xY!ia|X+<;4Vp0g!Hbb@17jBUt zhtDQ@Aw7*lv^Rt=X0#8br{~AuR$_2QVT(dJfP7mFsaFo@317CPT{*DRV22rlgLo%= nF&IgOmSmk+IxQfl?f6j&*}sGI?V^?rM|gp2fVNmZ*602O(LlYK delta 2328 zcmb7FX>?OX6#gdfC2#2~X+u*8NlMG6mbPGlDq$%gl*Q6kO9iArm8C^gP*mI?E`YeA z29%=gXhf<=0%@U87NH8LhzJOZ)P3Qfe>|thL%nwrdf@oWbMn6Ln|o*Oop| zVpz$r%ETLZlhtaTSIcS*tG5iijkQJ)>#*J+*ub#SB-o^3vxY4i-qG-`iA*fj5oUgm zVXKL*c;7?@wrQx-@qvjCv7N^sY1pA7V#1H8j-AZA7-9_dIvRBBX1RxN7)ElGv7Eoz z!YBCD!tE%xFdbDEMzL=;sx=(7a16&ae3oY6bIh{v1-nkL`VuEYm(;oLuW-u3*Enrq z0?sg;74U}&6@O^CJw53g3+LE;9;ZWF?R_i1#c2UC#KL#DVBvdQWM~nv83x%63qRmT z3qRp!0hKpz;TQa>;WrDv;{wf?PEV$QbIPcak)=iDV@k`4$Cgi+YT*x5LM>3UHGF4bIl~ytpTQb#KG8K+kgP@nM zP>Jpctu|(hiJ>;5FgS@^nNZ+_7n3QW4G!ASouufPP=P6^B%Vr7C#Y@Yv}u?|u79A5 zR&;5lHZk~AI4n&nBIbq8F53u!BnDT9Izj~#2~ElX^ra5y2g;pALe9rs@@+Yh0>Q?+ zDLe1=qS-Cz^yT~W)*&203abcGH)4f90*5beGv-9#id*eWn=$EH!zRpZK*tEu$lGUD z1Tt6y+)G!k!?^g=$~?8IG#*?{uu`fHj<0Dzuwz*mneEBbH=<*<&tH#DaZ`LM?@Y#7 zqKI(Y7;i0#)SY_G2#>XjY%lD+LsLn{+GSk)w&rU&Mb zvdN~Qv+Pciu7gC%8I+JydgvS|kCMp8oFd1Z$0l3FMY{ui=Q=G;q3E3{u58!rc!c)U zp7zw9L~6m;iR_-1B*d2k1SWW7`peSCx#yN=vj|m0X+*ookx!$dwdw)Yp3M2PjPE&L|IO=C?-?x_#9VW41EfMhTE`h5$+tt zZN$*GB$s?8Ic`I(is8n9>QQOT(bNs9&q9J#K77;dV?L61YpZ@|q3 zW(0=Y^f=UR`L2Pk07Wj3Kx2!Y{Zw$B2M!*DvYZ)1oo+MVo#b(7?j(Cn6`SQp;YyhG zb~7!t|Hl|wvbs8LoJz!p`m>w|I0xf)bN4v{V>Zpe^=oTD_>oAQvv>Lrd zOf-rn;sc^t93?&}&WLm9O$R@kNyaUxxCg;TAs$=ouDdLyM}AelD1*VzZ5{ZYybcN