Index: C:/eclipse/workspace/L2_GameServer_c4/java/net/sf/l2j/gameserver/clientpackets/RequestRestart.java =================================================================== --- C:/eclipse/workspace/L2_GameServer_c4/java/net/sf/l2j/gameserver/clientpackets/RequestRestart.java (revision 1722) +++ C:/eclipse/workspace/L2_GameServer_c4/java/net/sf/l2j/gameserver/clientpackets/RequestRestart.java (working copy) @@ -61,15 +61,20 @@ return; } - player.getInventory().updateDatabase(); + player.getInventory().updateDatabase(); if (player.getPrivateStoreType() != 0) { player.sendMessage("Cannot restart while trading"); return; } - + if(player.getActiveRequester() != null) + { + player.getActiveRequester().onTradeCancel(player); + player.onTradeCancel(player.getActiveRequester()); + } + if(GameTimeController.getGameTicks() - player.getAttackEndTime() < 15 * GameTimeController.TICKS_PER_SECOND || player.isAttacked()) { _log.fine("Player " + player.getName() + " tried to logout while fighting.");