API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Nov 28th, 2011
100
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 14.38 KB | None | 0 0
raw download clone embed print report
  1. Index: java/com/l2jserver/loginserver/LoginController.java
  2. ===================================================================
  3. --- java/com/l2jserver/loginserver/LoginController.java (revision 5097)
  4. +++ java/com/l2jserver/loginserver/LoginController.java (working copy)
  5. @@ -459,20 +459,6 @@
  6.         }
  7.     }
  8.    
  9. -   public void setCharactersOnServer(String account, int charsNum, long[] timeToDel, int serverId)
  10. -   {
  11. -       L2LoginClient client = _loginServerClients.get(account);
  12. -      
  13. -       if (client == null)
  14. -           return;
  15. -      
  16. -       if (charsNum > 0)
  17. -           client.setCharsOnServ(serverId, charsNum);
  18. -      
  19. -       if (timeToDel.length > 0)
  20. -           client.serCharsWaitingDelOnServ(serverId, timeToDel);
  21. -   }
  22. -  
  23.     /**
  24.      * <p>This method returns one of the cached {@link ScrambledKeyPair ScrambledKeyPairs} for communication with Login Clients.</p>
  25.      * @return a scrambled keypair
  26. Index: java/com/l2jserver/loginserver/network/gameserverpackets/ReplyCharacters.java
  27. ===================================================================
  28. --- java/com/l2jserver/loginserver/network/gameserverpackets/ReplyCharacters.java   (revision 5097)
  29. +++ java/com/l2jserver/loginserver/network/gameserverpackets/ReplyCharacters.java   (working copy)
  30. @@ -1,45 +0,0 @@
  31. -/*
  32. - * This program is free software: you can redistribute it and/or modify it under
  33. - * the terms of the GNU General Public License as published by the Free Software
  34. - * Foundation, either version 3 of the License, or (at your option) any later
  35. - * version.
  36. - *
  37. - * This program is distributed in the hope that it will be useful, but WITHOUT
  38. - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  39. - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  40. - * details.
  41. - *
  42. - * You should have received a copy of the GNU General Public License along with
  43. - * this program. If not, see <http://www.gnu.org/licenses/>.
  44. - */
  45. -package com.l2jserver.loginserver.network.gameserverpackets;
  46. -
  47. -import com.l2jserver.loginserver.GameServerThread;
  48. -import com.l2jserver.loginserver.LoginController;
  49. -import com.l2jserver.util.network.BaseRecievePacket;
  50. -
  51. -/**
  52. - * @author mrTJO
  53. - * Thanks to mochitto
  54. - */
  55. -public class ReplyCharacters extends BaseRecievePacket
  56. -{
  57. -   /**
  58. -    * @param decrypt
  59. -    * @param server
  60. -    */
  61. -   public ReplyCharacters(byte[] decrypt, GameServerThread server)
  62. -   {
  63. -       super(decrypt);
  64. -       String account = readS();
  65. -       int chars = readC();
  66. -       int charsToDel = readC();
  67. -       long[] charsList = new long[charsToDel];
  68. -       for (int i = 0; i < charsToDel; i++)
  69. -       {
  70. -           charsList[i] = readQ();
  71. -       }
  72. -       LoginController.getInstance().setCharactersOnServer(account,
  73. -               chars, charsList, server.getServerId());
  74. -   }
  75. -}
  76. Index: java/com/l2jserver/loginserver/network/L2LoginClient.java
  77. ===================================================================
  78. --- java/com/l2jserver/loginserver/network/L2LoginClient.java   (revision 5097)
  79. +++ java/com/l2jserver/loginserver/network/L2LoginClient.java   (working copy)
  80. @@ -18,8 +18,6 @@
  81.  import java.net.InetAddress;
  82.  import java.nio.ByteBuffer;
  83.  import java.security.interfaces.RSAPrivateKey;
  84. -import java.util.HashMap;
  85. -import java.util.Map;
  86.  import java.util.logging.Logger;
  87.  
  88.  import org.mmocore.network.MMOClient;
  89. @@ -52,20 +50,18 @@
  90.     private LoginClientState _state;
  91.    
  92.     // Crypt
  93. -   private LoginCrypt _loginCrypt;
  94. -   private ScrambledKeyPair _scrambledPair;
  95. -   private byte[] _blowfishKey;
  96. +   private final LoginCrypt _loginCrypt;
  97. +   private final ScrambledKeyPair _scrambledPair;
  98. +   private final byte[] _blowfishKey;
  99.    
  100.     private String _account;
  101.     private int _accessLevel;
  102.     private int _lastServer;
  103.     private SessionKey _sessionKey;
  104. -   private int _sessionId;
  105. +   private final int _sessionId;
  106.     private boolean _joinedGS;
  107. -   private Map<Integer, Integer> _charsOnServers;
  108. -   private Map<Integer, long[]> _charsToDelete;
  109.    
  110. -   private long _connectionStartTime;
  111. +   private final long _connectionStartTime;
  112.    
  113.     /**
  114.      * @param con
  115. @@ -237,30 +233,6 @@
  116.         getConnection().close(lsp);
  117.     }
  118.    
  119. -   public void setCharsOnServ(int servId, int chars)
  120. -   {
  121. -       if (_charsOnServers == null)
  122. -           _charsOnServers = new HashMap<Integer, Integer>();
  123. -       _charsOnServers.put(servId, chars);
  124. -   }
  125. -  
  126. -   public Map<Integer, Integer> getCharsOnServ()
  127. -   {
  128. -       return _charsOnServers;
  129. -   }
  130. -  
  131. -   public void serCharsWaitingDelOnServ(int servId, long[] charsToDel)
  132. -   {
  133. -       if (_charsToDelete == null)
  134. -           _charsToDelete = new HashMap<Integer, long[]>();
  135. -       _charsToDelete.put(servId, charsToDel);
  136. -   }
  137. -  
  138. -   public Map<Integer, long[]> getCharsWaitingDelOnServ()
  139. -   {
  140. -       return _charsToDelete;
  141. -   }
  142. -  
  143.     @Override
  144.     public void onDisconnection()
  145.     {
  146. Index: java/com/l2jserver/loginserver/network/L2JGameServerPacketHandler.java
  147. ===================================================================
  148. --- java/com/l2jserver/loginserver/network/L2JGameServerPacketHandler.java  (revision 5097)
  149. +++ java/com/l2jserver/loginserver/network/L2JGameServerPacketHandler.java  (working copy)
  150. @@ -26,7 +26,6 @@
  151.  import com.l2jserver.loginserver.network.gameserverpackets.PlayerInGame;
  152.  import com.l2jserver.loginserver.network.gameserverpackets.PlayerLogout;
  153.  import com.l2jserver.loginserver.network.gameserverpackets.PlayerTracert;
  154. -import com.l2jserver.loginserver.network.gameserverpackets.ReplyCharacters;
  155.  import com.l2jserver.loginserver.network.gameserverpackets.RequestSendMail;
  156.  import com.l2jserver.loginserver.network.gameserverpackets.RequestTempBan;
  157.  import com.l2jserver.loginserver.network.gameserverpackets.ServerStatus;
  158. @@ -94,9 +93,6 @@
  159.                     case 0x07:
  160.                         msg = new PlayerTracert(data);
  161.                         break;
  162. -                   case 0x08:
  163. -                       msg = new ReplyCharacters(data, server);
  164. -                       break;
  165.                     case 0x09:
  166.                         if (Config.EMAIL_SYS_ENABLED)
  167.                             msg = new RequestSendMail(data);
  168. Index: java/com/l2jserver/loginserver/network/serverpackets/ServerList.java
  169. ===================================================================
  170. --- java/com/l2jserver/loginserver/network/serverpackets/ServerList.java    (revision 5097)
  171. +++ java/com/l2jserver/loginserver/network/serverpackets/ServerList.java    (working copy)
  172. @@ -18,7 +18,6 @@
  173.  import java.net.UnknownHostException;
  174.  import java.util.ArrayList;
  175.  import java.util.List;
  176. -import java.util.Map;
  177.  
  178.  import com.l2jserver.loginserver.GameServerTable;
  179.  import com.l2jserver.loginserver.GameServerTable.GameServerInfo;
  180. @@ -52,10 +51,8 @@
  181.   */
  182.  public final class ServerList extends L2LoginServerPacket
  183.  {
  184. -   private List<ServerData> _servers;
  185. -   private int _lastServer;
  186. -   private Map<Integer, Integer> _charsOnServers;
  187. -   private Map<Integer, long[]> _charsToDelete;
  188. +   private final List<ServerData> _servers;
  189. +   private final int _lastServer;
  190.    
  191.     class ServerData
  192.     {
  193. @@ -106,8 +103,6 @@
  194.         _lastServer = client.getLastServer();
  195.         for (GameServerInfo gsi : GameServerTable.getInstance().getRegisteredGameServers().values())
  196.             _servers.add(new ServerData(client, gsi));
  197. -       _charsOnServers = client.getCharsOnServ();
  198. -       _charsToDelete = client.getCharsWaitingDelOnServ();
  199.     }
  200.    
  201.     @Override
  202. @@ -134,27 +129,5 @@
  203.             writeD(server._serverType); // 1: Normal, 2: Relax, 4: Public Test, 8: No Label, 16: Character Creation Restricted, 32: Event, 64: Free
  204.             writeC(server._brackets ? 0x01 : 0x00);
  205.         }
  206. -       writeH(0x00); // unknown
  207. -       if (_charsOnServers != null)
  208. -       {
  209. -           writeC(_charsOnServers.size());
  210. -           for (int servId : _charsOnServers.keySet())
  211. -           {
  212. -               writeC(servId);
  213. -               writeC(_charsOnServers.get(servId));
  214. -               if (_charsToDelete == null || !_charsToDelete.containsKey(servId))
  215. -                   writeC(0x00);
  216. -               else
  217. -               {
  218. -                   writeC(_charsToDelete.get(servId).length);
  219. -                   for (long deleteTime : _charsToDelete.get(servId))
  220. -                   {
  221. -                       writeD((int)((deleteTime-System.currentTimeMillis())/1000));
  222. -                   }
  223. -               }
  224. -           }
  225. -       }
  226. -       else
  227. -           writeC(0x00);
  228.     }
  229.  }
  230. Index: java/com/l2jserver/gameserver/LoginServerThread.java
  231. ===================================================================
  232. --- java/com/l2jserver/gameserver/LoginServerThread.java    (revision 5097)
  233. +++ java/com/l2jserver/gameserver/LoginServerThread.java    (working copy)
  234. @@ -27,11 +27,6 @@
  235.  import java.security.interfaces.RSAPublicKey;
  236.  import java.security.spec.RSAKeyGenParameterSpec;
  237.  import java.security.spec.RSAPublicKeySpec;
  238. -import java.sql.Connection;
  239. -import java.sql.PreparedStatement;
  240. -import java.sql.ResultSet;
  241. -import java.sql.SQLException;
  242. -import java.util.ArrayList;
  243.  import java.util.List;
  244.  import java.util.Map;
  245.  import java.util.logging.Level;
  246. @@ -42,7 +37,6 @@
  247.  import javolution.util.FastMap;
  248.  
  249.  import com.l2jserver.Config;
  250. -import com.l2jserver.L2DatabaseFactory;
  251.  import com.l2jserver.gameserver.model.L2World;
  252.  import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
  253.  import com.l2jserver.gameserver.network.L2GameClient;
  254. @@ -56,7 +50,6 @@
  255.  import com.l2jserver.gameserver.network.gameserverpackets.PlayerInGame;
  256.  import com.l2jserver.gameserver.network.gameserverpackets.PlayerLogout;
  257.  import com.l2jserver.gameserver.network.gameserverpackets.PlayerTracert;
  258. -import com.l2jserver.gameserver.network.gameserverpackets.ReplyCharacters;
  259.  import com.l2jserver.gameserver.network.gameserverpackets.SendMail;
  260.  import com.l2jserver.gameserver.network.gameserverpackets.ServerStatus;
  261.  import com.l2jserver.gameserver.network.gameserverpackets.TempBan;
  262. @@ -66,7 +59,6 @@
  263.  import com.l2jserver.gameserver.network.loginserverpackets.KickPlayer;
  264.  import com.l2jserver.gameserver.network.loginserverpackets.LoginServerFail;
  265.  import com.l2jserver.gameserver.network.loginserverpackets.PlayerAuthResponse;
  266. -import com.l2jserver.gameserver.network.loginserverpackets.RequestCharacters;
  267.  import com.l2jserver.gameserver.network.serverpackets.CharSelectionInfo;
  268.  import com.l2jserver.gameserver.network.serverpackets.LoginFail;
  269.  import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
  270. @@ -346,10 +338,6 @@
  271.                             KickPlayer kp = new KickPlayer(decrypt);
  272.                             doKickPlayer(kp.getAccount());
  273.                             break;
  274. -                       case 0x05:
  275. -                           RequestCharacters rc = new RequestCharacters(decrypt);
  276. -                           getCharsOnServer(rc.getAccount());
  277. -                           break;
  278.                         case 0x06:
  279.                             new ChangePasswordResponse(decrypt);
  280.                             break;
  281. @@ -533,49 +521,6 @@
  282.         }
  283.     }
  284.    
  285. -   private void getCharsOnServer(String account)
  286. -   {
  287. -       Connection con = null;
  288. -       int chars = 0;
  289. -       List<Long> charToDel = new ArrayList<Long>();
  290. -       try
  291. -       {
  292. -           con = L2DatabaseFactory.getInstance().getConnection();
  293. -           PreparedStatement statement = con.prepareStatement("SELECT deletetime FROM characters WHERE account_name=?");
  294. -           statement.setString(1, account);
  295. -           ResultSet rset = statement.executeQuery();
  296. -           while (rset.next())
  297. -           {
  298. -               chars++;
  299. -               long delTime = rset.getLong("deletetime");
  300. -               if (delTime != 0)
  301. -                   charToDel.add(delTime);
  302. -           }
  303. -           rset.close();
  304. -           statement.close();
  305. -       }
  306. -       catch (SQLException e)
  307. -       {
  308. -           _log.log(Level.WARNING, "Exception: getCharsOnServer: " + e.getMessage(), e);
  309. -       }
  310. -       finally
  311. -       {
  312. -           L2DatabaseFactory.close(con);
  313. -       }
  314. -      
  315. -       ReplyCharacters rec = new ReplyCharacters(account, chars, charToDel);
  316. -       try
  317. -       {
  318. -           sendPacket(rec);
  319. -       }
  320. -       catch (IOException e)
  321. -       {
  322. -           if (Config.DEBUG)
  323. -               _log.log(Level.WARNING, "", e);
  324. -       }
  325. -      
  326. -   }
  327. -  
  328.     /**
  329.      * @param sl
  330.      * @throws IOException
  331. Index: java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java
  332. ===================================================================
  333. --- java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java    (revision 5097)
  334. +++ java/com/l2jserver/gameserver/network/gameserverpackets/ReplyCharacters.java    (working copy)
  335. @@ -1,46 +0,0 @@
  336. -/*
  337. - * This program is free software: you can redistribute it and/or modify it under
  338. - * the terms of the GNU General Public License as published by the Free Software
  339. - * Foundation, either version 3 of the License, or (at your option) any later
  340. - * version.
  341. - *
  342. - * This program is distributed in the hope that it will be useful, but WITHOUT
  343. - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  344. - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  345. - * details.
  346. - *
  347. - * You should have received a copy of the GNU General Public License along with
  348. - * this program. If not, see <http://www.gnu.org/licenses/>.
  349. - */
  350. -package com.l2jserver.gameserver.network.gameserverpackets;
  351. -
  352. -import java.util.List;
  353. -
  354. -import com.l2jserver.util.network.BaseSendablePacket;
  355. -
  356. -/**
  357. - * @author mrTJO
  358. - * Thanks to mochitto
  359. - */
  360. -public class ReplyCharacters extends BaseSendablePacket
  361. -{
  362. -  
  363. -   public ReplyCharacters(String account, int chars, List<Long> timeToDel)
  364. -   {
  365. -       writeC(0x08);
  366. -       writeS(account);
  367. -       writeC(chars);
  368. -       writeC(timeToDel.size());
  369. -       for (long time : timeToDel)
  370. -       {
  371. -           writeQ(time);
  372. -       }
  373. -   }
  374. -  
  375. -   @Override
  376. -   public byte[] getContent()
  377. -   {
  378. -       return getBytes();
  379. -   }
  380. -  
  381. -}
  382. Index: java/com/l2jserver/gameserver/network/loginserverpackets/RequestCharacters.java
  383. ===================================================================
  384. --- java/com/l2jserver/gameserver/network/loginserverpackets/RequestCharacters.java (revision 5097)
  385. +++ java/com/l2jserver/gameserver/network/loginserverpackets/RequestCharacters.java (working copy)
  386. @@ -1,40 +0,0 @@
  387. -/*
  388. - * This program is free software: you can redistribute it and/or modify it under
  389. - * the terms of the GNU General Public License as published by the Free Software
  390. - * Foundation, either version 3 of the License, or (at your option) any later
  391. - * version.
  392. - *
  393. - * This program is distributed in the hope that it will be useful, but WITHOUT
  394. - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  395. - * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  396. - * details.
  397. - *
  398. - * You should have received a copy of the GNU General Public License along with
  399. - * this program. If not, see <http://www.gnu.org/licenses/>.
  400. - */
  401. -package com.l2jserver.gameserver.network.loginserverpackets;
  402. -
  403. -import com.l2jserver.util.network.BaseRecievePacket;
  404. -
  405. -/**
  406. - * @author mrTJO
  407. - * Thanks to mochitto
  408. - */
  409. -public class RequestCharacters extends BaseRecievePacket
  410. -{
  411. -   private String _account;
  412. -  
  413. -   public RequestCharacters(byte[] decrypt)
  414. -   {
  415. -       super(decrypt);
  416. -       _account = readS();
  417. -   }
  418. -  
  419. -   /**
  420. -    * @return Return account name
  421. -    */
  422. -   public String getAccount()
  423. -   {
  424. -       return _account;
  425. -   }
  426. -}
  427.  
  428.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!