API tools faq
paste
Advertisement
Guest User

mount-craft

a guest
Jun 28th, 2020
111
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 19.64 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/L2JHellasC/java/com/l2jhellas/gameserver/handlers/admincommandhandlers/AdminRes.java b/L2JHellasC/java/com/l2jhellas/gameserver/handlers/admincommandhandlers/AdminRes.java
  2. index 7bbfcbf..3d6e092 100644
  3. --- a/L2JHellasC/java/com/l2jhellas/gameserver/handlers/admincommandhandlers/AdminRes.java
  4. +++ b/L2JHellasC/java/com/l2jhellas/gameserver/handlers/admincommandhandlers/AdminRes.java
  5. @@ -47,7 +47,7 @@
  6. {
  7. L2Object obj = activeChar.getTarget();
  8.  
  9. - if (!resParam.isEmpty())
  10. + if (resParam != null)
  11. {
  12. L2PcInstance plr = L2World.getInstance().getPlayer(resParam);
  13.  
  14. diff --git a/L2JHellasC/java/com/l2jhellas/gameserver/handlers/itemhandlers/Recipes.java b/L2JHellasC/java/com/l2jhellas/gameserver/handlers/itemhandlers/Recipes.java
  15. index 4620157..9075256 100644
  16. --- a/L2JHellasC/java/com/l2jhellas/gameserver/handlers/itemhandlers/Recipes.java
  17. +++ b/L2JHellasC/java/com/l2jhellas/gameserver/handlers/itemhandlers/Recipes.java
  18. @@ -8,6 +8,7 @@
  19. import com.l2jhellas.gameserver.model.actor.instance.L2PcInstance;
  20. import com.l2jhellas.gameserver.model.actor.item.L2ItemInstance;
  21. import com.l2jhellas.gameserver.network.SystemMessageId;
  22. +import com.l2jhellas.gameserver.network.serverpackets.ItemList;
  23. import com.l2jhellas.gameserver.network.serverpackets.SystemMessage;
  24.  
  25. public class Recipes implements IItemHandler
  26. @@ -29,76 +30,59 @@
  27. {
  28. if (!(playable instanceof L2PcInstance))
  29. return;
  30. - L2PcInstance activeChar = (L2PcInstance) playable;
  31. - L2RecipeList rp = RecipeData.getInstance().getRecipeByItemId(item.getItemId());
  32. - if (activeChar.hasRecipeList(rp.getId()))
  33. - {
  34. - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.RECIPE_ALREADY_REGISTERED);
  35. - activeChar.sendPacket(sm);
  36. - }
  37. +
  38. + final L2PcInstance activeChar = (L2PcInstance) playable;
  39. +
  40. + final L2RecipeList rp = RecipeData.getInstance().getRecipeByItemId(item.getItemId());
  41. +
  42. + if(rp == null)
  43. + return;
  44. +
  45. + if (activeChar.hasRecipeList(rp.getId(),rp.isDwarvenRecipe()))
  46. + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.RECIPE_ALREADY_REGISTERED));
  47. else
  48. {
  49. if (rp.isDwarvenRecipe())
  50. {
  51. if (activeChar.hasDwarvenCraft())
  52. {
  53. + // can't add recipe, because create item level too low
  54. if (rp.getLevel() > activeChar.getDwarvenCraft())
  55. - {
  56. - // can't add recipe, because create item level too low
  57. - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER);
  58. - activeChar.sendPacket(sm);
  59. - }
  60. + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER));
  61. else if (activeChar.getDwarvenRecipeBook().size() >= activeChar.getDwarfRecipeLimit())
  62. - {
  63. - // Up to $s1 recipes can be registered.
  64. - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER);
  65. - sm.addNumber(activeChar.getDwarfRecipeLimit());
  66. - activeChar.sendPacket(sm);
  67. - }
  68. + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER).addNumber(activeChar.getDwarfRecipeLimit()));
  69. else
  70. {
  71. activeChar.registerDwarvenRecipeList(rp);
  72. activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false);
  73. String itemName = ItemTable.getInstance().getTemplate(rp.getItemId()).getItemName();
  74. activeChar.sendMessage("Added recipe " + itemName + " to Dwarven RecipeBook.");
  75. + activeChar.sendPacket(new ItemList(activeChar,false));
  76. }
  77. }
  78. else
  79. - {
  80. - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT);
  81. - activeChar.sendPacket(sm);
  82. - }
  83. + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT));
  84. }
  85. else
  86. {
  87. if (activeChar.hasCommonCraft())
  88. {
  89. + // can't add recipe, because create item level too low
  90. if (rp.getLevel() > activeChar.getCommonCraft())
  91. - {
  92. - // can't add recipe, because create item level too low
  93. - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER);
  94. - activeChar.sendPacket(sm);
  95. - }
  96. + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CREATE_LVL_TOO_LOW_TO_REGISTER));
  97. else if (activeChar.getCommonRecipeBook().size() >= activeChar.getCommonRecipeLimit())
  98. - {
  99. - // Up to $s1 recipes can be registered.
  100. - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER);
  101. - sm.addNumber(activeChar.getCommonRecipeLimit());
  102. - activeChar.sendPacket(sm);
  103. - }
  104. + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_REGISTER).addNumber(activeChar.getCommonRecipeLimit()));
  105. else
  106. {
  107. activeChar.registerCommonRecipeList(rp);
  108. activeChar.destroyItem("Consume", item.getObjectId(), 1, null, false);
  109. String itemName = ItemTable.getInstance().getTemplate(rp.getItemId()).getItemName();
  110. activeChar.sendMessage("Added recipe " + itemName + " to Common RecipeBook.");
  111. + activeChar.sendPacket(new ItemList(activeChar,false));
  112. }
  113. }
  114. else
  115. - {
  116. - SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT);
  117. - activeChar.sendPacket(sm);
  118. - }
  119. + activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANT_REGISTER_NO_ABILITY_TO_CRAFT));
  120. }
  121. }
  122. }
  123. diff --git a/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/L2Attackable.java b/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/L2Attackable.java
  124. index 34954ad..7e6d89d 100644
  125. --- a/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/L2Attackable.java
  126. +++ b/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/L2Attackable.java
  127. @@ -1266,13 +1266,9 @@
  128. {
  129. RewardItem item = new RewardItem(8612, 1); // Herb of Warrior
  130. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  131. - {
  132. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  133. - }
  134. else
  135. - {
  136. dropItem(player, item);
  137. - }
  138. _spec = true;
  139. }
  140. else
  141. @@ -1284,27 +1280,17 @@
  142. {
  143. item = null;
  144. if (i == 0)
  145. - {
  146. item = new RewardItem(8606, 1); // Herb of Power
  147. - }
  148. if (i == 1)
  149. - {
  150. item = new RewardItem(8608, 1); // Herb of Atk. Spd.
  151. - }
  152. if (i == 2)
  153. - {
  154. item = new RewardItem(8610, 1); // Herb of Critical
  155. // Attack
  156. - }
  157.  
  158. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  159. - {
  160. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  161. - }
  162. else
  163. - {
  164. dropItem(player, item);
  165. - }
  166. break;
  167. }
  168. }
  169. @@ -1316,13 +1302,9 @@
  170. {
  171. RewardItem item = new RewardItem(8613, 1); // Herb of Mystic
  172. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  173. - {
  174. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  175. - }
  176. else
  177. - {
  178. dropItem(player, item);
  179. - }
  180. _spec = true;
  181. }
  182. else
  183. @@ -1334,23 +1316,14 @@
  184. {
  185. item2 = null;
  186. if (i == 0)
  187. - {
  188. item2 = new RewardItem(8607, 1); // Herb of Magic
  189. - }
  190. if (i == 1)
  191. - {
  192. item2 = new RewardItem(8609, 1); // Herb of Casting
  193. - // Speed
  194. - }
  195.  
  196. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  197. - {
  198. player.addItem("Loot", item2.getItemId(), item2.getCount(), this, true);
  199. - }
  200. else
  201. - {
  202. dropItem(player, item2);
  203. - }
  204. break;
  205. }
  206. }
  207. @@ -1362,13 +1335,9 @@
  208. {
  209. RewardItem item = new RewardItem(8614, 1); // Herb of Recovery
  210. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  211. - {
  212. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  213. - }
  214. else
  215. - {
  216. dropItem(player, item);
  217. - }
  218. _mp = true;
  219. _hp = true;
  220. _spec = true;
  221. @@ -1381,13 +1350,10 @@
  222. {
  223. RewardItem item = new RewardItem(8600, 1); // Herb of Life
  224. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  225. - {
  226. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  227. - }
  228. else
  229. - {
  230. dropItem(player, item);
  231. - }
  232. +
  233. _hp = true;
  234. }
  235. }
  236. @@ -1399,13 +1365,10 @@
  237. RewardItem item = new RewardItem(8601, 1); // Greater Herb
  238. // of Life
  239. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  240. - {
  241. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  242. - }
  243. else
  244. - {
  245. dropItem(player, item);
  246. - }
  247. +
  248. _hp = true;
  249. }
  250. }
  251. @@ -1417,13 +1380,9 @@
  252. RewardItem item = new RewardItem(8602, 1); // Superior Herb
  253. // of Life
  254. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  255. - {
  256. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  257. - }
  258. else
  259. - {
  260. dropItem(player, item);
  261. - }
  262. }
  263. }
  264. // mp - restore mp type
  265. @@ -1434,13 +1393,9 @@
  266. {
  267. RewardItem item = new RewardItem(8603, 1); // Herb of Manna
  268. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  269. - {
  270. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  271. - }
  272. else
  273. - {
  274. dropItem(player, item);
  275. - }
  276. _mp = true;
  277. }
  278. }
  279. @@ -1452,13 +1407,9 @@
  280. RewardItem item = new RewardItem(8604, 1); // Greater Herb
  281. // of Mana
  282. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  283. - {
  284. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  285. - }
  286. else
  287. - {
  288. dropItem(player, item);
  289. - }
  290. _mp = true;
  291. }
  292. }
  293. @@ -1470,13 +1421,9 @@
  294. RewardItem item = new RewardItem(8605, 1); // Superior Herb
  295. // of Mana
  296. if (Config.AUTO_LOOT && Config.AUTO_LOOT_HERBS)
  297. - {
  298. player.addItem("Loot", item.getItemId(), item.getCount(), this, true);
  299. - }
  300. else
  301. - {
  302. dropItem(player, item);
  303. - }
  304. }
  305. }
  306. // speed enhance type
  307. diff --git a/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/instance/L2PcInstance.java b/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/instance/L2PcInstance.java
  308. index e695de9..91453a0 100644
  309. --- a/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/instance/L2PcInstance.java
  310. +++ b/L2JHellasC/java/com/l2jhellas/gameserver/model/actor/instance/L2PcInstance.java
  311. @@ -1094,6 +1094,11 @@
  312. _dwarvenRecipeBook.put(recipe.getId(), recipe);
  313. }
  314.  
  315. + public boolean hasRecipeList(int recipeId, boolean isDwarven)
  316. + {
  317. + return (isDwarven) ? _dwarvenRecipeBook.containsKey(recipeId) : _commonRecipeBook.containsKey(recipeId);
  318. + }
  319. +
  320. public boolean hasRecipeList(int recipeId)
  321. {
  322. if (_dwarvenRecipeBook.containsKey(recipeId))
  323. @@ -7057,6 +7062,10 @@
  324. switch (mountType)
  325. {
  326. case 0:
  327. +
  328. + if (isFlying())
  329. + removeSkill(SkillTable.getInstance().getInfo(4289, 1));
  330. +
  331. setIsFlying(false);
  332. setIsRiding(false);
  333. break; // Dismounted
  334. @@ -8437,13 +8446,11 @@
  335.  
  336. public void restartRecom()
  337. {
  338. - try (Connection con = L2DatabaseFactory.getInstance().getConnection())
  339. + try (Connection con = L2DatabaseFactory.getInstance().getConnection();
  340. + PreparedStatement statement = con.prepareStatement(DELETE_CHAR_RECOMS))
  341. {
  342. - PreparedStatement statement = con.prepareStatement(DELETE_CHAR_RECOMS);
  343. statement.setInt(1, getObjectId());
  344. - statement.execute();
  345. - statement.close();
  346. -
  347. + statement.execute();
  348. _recomChars.clear();
  349. }
  350. catch (Exception e)
  351. @@ -10078,16 +10085,19 @@
  352. long banLength = 0;
  353. String banReason = "";
  354.  
  355. - try (Connection con = L2DatabaseFactory.getInstance().getConnection())
  356. + try (Connection con = L2DatabaseFactory.getInstance().getConnection();
  357. + PreparedStatement statement = con.prepareStatement(BAN_CHAT_GET))
  358. {
  359. - PreparedStatement statement = con.prepareStatement(BAN_CHAT_GET);
  360. statement.setString(1, getName());
  361. - ResultSet rset = statement.executeQuery();
  362. - rset.next();
  363. - banLength = rset.getLong("chatban_timer");
  364. - banReason = rset.getString("chatban_reason");
  365. - rset.close();
  366. - statement.close();
  367. +
  368. + try (ResultSet rset = statement.executeQuery())
  369. + {
  370. + while (rset.next())
  371. + {
  372. + banLength = rset.getLong("chatban_timer");
  373. + banReason = rset.getString("chatban_reason");
  374. + }
  375. + }
  376. }
  377. catch (SQLException e)
  378. {
  379. @@ -10124,14 +10134,13 @@
  380. banLengthMSec = nowTime + (banLength * 1000);
  381. }
  382.  
  383. - try (Connection con = L2DatabaseFactory.getInstance().getConnection())
  384. + try (Connection con = L2DatabaseFactory.getInstance().getConnection();
  385. + PreparedStatement statement = con.prepareStatement(BAN_CHAT_SET))
  386. {
  387. - PreparedStatement statement = con.prepareStatement(BAN_CHAT_SET);
  388. statement.setLong(1, banLengthMSec);
  389. statement.setString(2, banReason);
  390. statement.setString(3, getName());
  391. statement.execute();
  392. - statement.close();
  393. }
  394. catch (SQLException e)
  395. {
  396. @@ -10422,9 +10431,9 @@
  397.  
  398. public void getAchievemntData()
  399. {
  400. - try (Connection con = L2DatabaseFactory.getInstance().getConnection())
  401. + try (Connection con = L2DatabaseFactory.getInstance().getConnection();
  402. + PreparedStatement statement = con.prepareStatement("SELECT * FROM achievements WHERE owner_id=" + getObjectId()))
  403. {
  404. - PreparedStatement statement = con.prepareStatement("SELECT * FROM achievements WHERE owner_id=" + getObjectId());
  405. ResultSet rs = statement.executeQuery();
  406. String values = "owner_id";
  407. String in = Integer.toString(getObjectId());
  408. @@ -11857,24 +11866,22 @@
  409. {
  410. _friendList.clear();
  411.  
  412. - try (Connection con = L2DatabaseFactory.getInstance().getConnection())
  413. + try (Connection con = L2DatabaseFactory.getInstance().getConnection();
  414. + PreparedStatement statement = con.prepareStatement("SELECT friend_id FROM character_friends WHERE char_id = ?"))
  415. {
  416. - PreparedStatement statement = con.prepareStatement("SELECT friend_id FROM character_friends WHERE char_id = ?");
  417. - statement.setInt(1, getObjectId());
  418. - ResultSet rset = statement.executeQuery();
  419. -
  420. - int friendId;
  421. - while (rset.next())
  422. - {
  423. - friendId = rset.getInt("friend_id");
  424. - if (friendId == getObjectId())
  425. - continue;
  426. -
  427. - _friendList.add(friendId);
  428. - }
  429. -
  430. - rset.close();
  431. - statement.close();
  432. + statement.setInt(1, getObjectId());
  433. + try (ResultSet rset = statement.executeQuery())
  434. + {
  435. + int friendId;
  436. + while (rset.next())
  437. + {
  438. + friendId = rset.getInt("friend_id");
  439. + if (friendId == getObjectId())
  440. + continue;
  441. +
  442. + _friendList.add(friendId);
  443. + }
  444. + }
  445. }
  446. catch (Exception e)
  447. {
  448. diff --git a/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/Logout.java b/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/Logout.java
  449. index cff9884..e49d3e7 100644
  450. --- a/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/Logout.java
  451. +++ b/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/Logout.java
  452. @@ -16,7 +16,6 @@
  453. import com.l2jhellas.gameserver.network.serverpackets.ActionFailed;
  454. import com.l2jhellas.gameserver.network.serverpackets.FriendList;
  455. import com.l2jhellas.gameserver.network.serverpackets.SystemMessage;
  456. -import com.l2jhellas.gameserver.skills.SkillTable;
  457. import com.l2jhellas.gameserver.taskmanager.AttackStanceTaskManager;
  458. import com.l2jhellas.util.database.L2DatabaseFactory;
  459.  
  460. @@ -93,9 +92,9 @@
  461. else
  462. EventManager.getInstance().onLogout(player);
  463. }
  464. -
  465. - if (player.isFlying())
  466. - player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
  467. +
  468. + if(player.isMounted())
  469. + player.dismount();
  470.  
  471. player.endDuel();
  472.  
  473. diff --git a/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRecipeShopListSet.java b/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRecipeShopListSet.java
  474. index 16754fb..e2d3246 100644
  475. --- a/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRecipeShopListSet.java
  476. +++ b/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRecipeShopListSet.java
  477. @@ -1,12 +1,7 @@
  478. package com.l2jhellas.gameserver.network.clientpackets;
  479.  
  480. -import java.util.Arrays;
  481. -import java.util.Collection;
  482. -import java.util.List;
  483. -
  484. import com.l2jhellas.Config;
  485. import com.l2jhellas.gameserver.datatables.xml.RecipeData;
  486. -import com.l2jhellas.gameserver.enums.ZoneId;
  487. import com.l2jhellas.gameserver.enums.player.StoreType;
  488. import com.l2jhellas.gameserver.model.L2ManufactureItem;
  489. import com.l2jhellas.gameserver.model.L2ManufactureList;
  490. @@ -14,7 +9,6 @@
  491. import com.l2jhellas.gameserver.model.actor.instance.L2PcInstance;
  492. import com.l2jhellas.gameserver.network.SystemMessageId;
  493. import com.l2jhellas.gameserver.network.serverpackets.RecipeShopMsg;
  494. -import com.l2jhellas.gameserver.taskmanager.AttackStanceTaskManager;
  495. import com.l2jhellas.util.Util;
  496.  
  497. public final class RequestRecipeShopListSet extends L2GameClientPacket
  498. @@ -56,27 +50,9 @@
  499. return;
  500. }
  501.  
  502. - if (player.isInsideZone(ZoneId.NO_STORE))
  503. - {
  504. - player.sendPacket(SystemMessageId.NO_PRIVATE_STORE_HERE);
  505. + if (!player.canOpenPrivateStore())
  506. return;
  507. - }
  508. -
  509. - if (player.isSitting() && !player.isInStoreMode())
  510. - return;
  511. -
  512. - if (player.isAlikeDead() || player.isMounted() || player.isProcessingRequest())
  513. - return;
  514.  
  515. - if (player.isInDuel() || player.isCastingNow() || AttackStanceTaskManager.getInstance().isInAttackStance(player) || player.isInOlympiadMode())
  516. - {
  517. - player.sendPacket(SystemMessageId.CANT_OPERATE_PRIVATE_STORE_DURING_COMBAT);
  518. - return;
  519. - }
  520. -
  521. - final List<Collection<L2RecipeList>> dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook());
  522. - final List<Collection<L2RecipeList>> commonRecipes = Arrays.asList(player.getCommonRecipeBook());
  523. -
  524. L2ManufactureList createList = new L2ManufactureList();
  525. createList.clear();
  526.  
  527. @@ -94,12 +70,12 @@
  528. return;
  529. }
  530.  
  531. - if (!dwarfRecipes.contains(list) && !commonRecipes.contains(list))
  532. - {
  533. + if(!player.hasRecipeList(recipeID,list.isDwarvenRecipe()))
  534. + {
  535. Util.handleIllegalPlayerAction(player, "Warning!! Player " + player.getName() + " of account " + player.getAccountName() + " tried to set recipe which he dont have.", Config.DEFAULT_PUNISH);
  536. return;
  537. }
  538. -
  539. +
  540. if (cost > 2000000000)
  541. return;
  542.  
  543. diff --git a/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRestart.java b/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRestart.java
  544. index a2ff29b..abd85c5 100644
  545. --- a/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRestart.java
  546. +++ b/L2JHellasC/java/com/l2jhellas/gameserver/network/clientpackets/RequestRestart.java
  547. @@ -13,7 +13,6 @@
  548. import com.l2jhellas.gameserver.network.serverpackets.CharSelectInfo;
  549. import com.l2jhellas.gameserver.network.serverpackets.RestartResponse;
  550. import com.l2jhellas.gameserver.network.serverpackets.SystemMessage;
  551. -import com.l2jhellas.gameserver.skills.SkillTable;
  552. import com.l2jhellas.gameserver.taskmanager.AttackStanceTaskManager;
  553.  
  554. public final class RequestRestart extends L2GameClientPacket
  555. @@ -104,10 +103,9 @@
  556. player.getActiveRequester().onTradeCancel(player);
  557. player.onTradeCancel(player.getActiveRequester());
  558. }
  559. -
  560. -
  561. - if (player.isFlying())
  562. - player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
  563. +
  564. + if(player.isMounted())
  565. + player.dismount();
  566.  
  567. if (player.isRegisteredInFunEvent())
  568. {
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!