- Implemented jumping system client packets.
- Reworked friend / block manager to containg memo and show correct data. - Fixed throwing exception, on player login if 2 invisible GMs are next to each other.
This commit is contained in:
@ -37,6 +37,8 @@ import com.l2jserver.gameserver.network.clientpackets.friend.RequestFriendDel;
|
||||
import com.l2jserver.gameserver.network.clientpackets.friend.RequestFriendDetailInfo;
|
||||
import com.l2jserver.gameserver.network.clientpackets.friend.RequestFriendList;
|
||||
import com.l2jserver.gameserver.network.clientpackets.friend.RequestSendFriendMsg;
|
||||
import com.l2jserver.gameserver.network.clientpackets.friend.RequestUpdateBlockMemo;
|
||||
import com.l2jserver.gameserver.network.clientpackets.friend.RequestUpdateFriendMemo;
|
||||
import com.l2jserver.gameserver.network.clientpackets.mentoring.ConfirmMenteeAdd;
|
||||
import com.l2jserver.gameserver.network.clientpackets.mentoring.RequestMenteeAdd;
|
||||
import com.l2jserver.gameserver.network.clientpackets.mentoring.RequestMenteeWaitingList;
|
||||
@ -1302,7 +1304,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
|
||||
// @ msg = new RequestExEscapeScene();
|
||||
break;
|
||||
case 0x91:
|
||||
// msg = new RequestFlyMove();
|
||||
msg = new RequestFlyMove();
|
||||
break;
|
||||
case 0x92:
|
||||
// msg = new RequestSurrenderPledgeWarEX(); (chS)
|
||||
@ -1332,10 +1334,10 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
|
||||
msg = new RequestFriendDetailInfo();
|
||||
break;
|
||||
case 0x95:
|
||||
// msg = new RequestUpdateFriendMemo();
|
||||
msg = new RequestUpdateFriendMemo();
|
||||
break;
|
||||
case 0x96:
|
||||
// msg = new RequestUpdateBlockMemo();
|
||||
msg = new RequestUpdateBlockMemo();
|
||||
break;
|
||||
case 0x97:
|
||||
// msg = new RequestInzonePartyInfoHistory();
|
||||
@ -1392,7 +1394,7 @@ public final class L2GamePacketHandler implements IPacketHandler<L2GameClient>,
|
||||
// msg = new RequestFirstPlayStart();
|
||||
break;
|
||||
case 0xAD:
|
||||
// msg = new RequestFlyMoveStart();
|
||||
msg = new RequestFlyMoveStart();
|
||||
break;
|
||||
case 0xAE:
|
||||
case 0xAF:
|
||||
|
@ -461,7 +461,7 @@ public class EnterWorld extends L2GameClientPacket
|
||||
|
||||
SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.YOUR_FRIEND_S1_JUST_LOGGED_IN);
|
||||
sm.addString(activeChar.getName());
|
||||
for (int id : activeChar.getFriendList())
|
||||
for (int id : activeChar.getFriendList().keySet())
|
||||
{
|
||||
L2Object obj = L2World.getInstance().findObject(id);
|
||||
if (obj != null)
|
||||
|
@ -22,6 +22,7 @@ import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
|
||||
import com.l2jserver.gameserver.model.BlockList;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.network.SystemMessageId;
|
||||
import com.l2jserver.gameserver.network.serverpackets.friend.BlockListPacket;
|
||||
|
||||
public final class RequestBlock extends L2GameClientPacket
|
||||
{
|
||||
@ -91,6 +92,7 @@ public final class RequestBlock extends L2GameClientPacket
|
||||
{
|
||||
BlockList.removeFromBlockList(activeChar, targetId);
|
||||
}
|
||||
activeChar.sendPacket(new BlockListPacket(activeChar));
|
||||
break;
|
||||
case BLOCKLIST:
|
||||
BlockList.sendListToOwner(activeChar);
|
||||
|
@ -83,7 +83,7 @@ public final class RequestFriendInvite extends L2GameClientPacket
|
||||
return;
|
||||
}
|
||||
// Target already in friend list.
|
||||
if (activeChar.getFriendList().contains(friend.getObjectId()))
|
||||
if (activeChar.getFriendList().containsKey(friend.getObjectId()))
|
||||
{
|
||||
sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||
sm.addString(_name);
|
||||
|
@ -28,6 +28,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
|
||||
import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket;
|
||||
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
|
||||
import com.l2jserver.gameserver.network.serverpackets.friend.FriendAddRequestResult;
|
||||
import com.l2jserver.gameserver.network.serverpackets.friend.FriendList;
|
||||
|
||||
public final class RequestAnswerFriendInvite extends L2GameClientPacket
|
||||
{
|
||||
@ -70,17 +71,19 @@ public final class RequestAnswerFriendInvite extends L2GameClientPacket
|
||||
msg = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_BEEN_ADDED_TO_YOUR_FRIENDS_LIST);
|
||||
msg.addString(player.getName());
|
||||
requestor.sendPacket(msg);
|
||||
requestor.getFriendList().add(player.getObjectId());
|
||||
requestor.addFriend(player);
|
||||
|
||||
// has joined as friend.
|
||||
msg = SystemMessage.getSystemMessage(SystemMessageId.S1_HAS_JOINED_AS_A_FRIEND);
|
||||
msg.addString(requestor.getName());
|
||||
player.sendPacket(msg);
|
||||
player.getFriendList().add(requestor.getObjectId());
|
||||
player.addFriend(requestor);
|
||||
|
||||
// Send notifications for both player in order to show them online
|
||||
player.sendPacket(new FriendAddRequestResult(requestor, 1));
|
||||
requestor.sendPacket(new FriendAddRequestResult(player, 1));
|
||||
player.sendPacket(new FriendList(player));
|
||||
requestor.sendPacket(new FriendList(requestor));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
@ -29,6 +29,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.network.SystemMessageId;
|
||||
import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket;
|
||||
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
|
||||
import com.l2jserver.gameserver.network.serverpackets.friend.FriendList;
|
||||
import com.l2jserver.gameserver.network.serverpackets.friend.FriendRemove;
|
||||
|
||||
/**
|
||||
@ -68,7 +69,7 @@ public final class RequestFriendDel extends L2GameClientPacket
|
||||
return;
|
||||
}
|
||||
|
||||
if (!activeChar.getFriendList().contains(id))
|
||||
if (!activeChar.getFriendList().containsKey(id))
|
||||
{
|
||||
sm = SystemMessage.getSystemMessage(SystemMessageId.C1_IS_NOT_ON_YOUR_FRIEND_LIST);
|
||||
sm.addString(_name);
|
||||
@ -90,7 +91,7 @@ public final class RequestFriendDel extends L2GameClientPacket
|
||||
sm.addString(_name);
|
||||
activeChar.sendPacket(sm);
|
||||
|
||||
activeChar.getFriendList().remove(Integer.valueOf(id));
|
||||
activeChar.getFriendList().remove(id);
|
||||
activeChar.sendPacket(new FriendRemove(_name, 1));
|
||||
|
||||
L2PcInstance player = L2World.getInstance().getPlayer(_name);
|
||||
@ -99,6 +100,8 @@ public final class RequestFriendDel extends L2GameClientPacket
|
||||
player.getFriendList().remove(Integer.valueOf(activeChar.getObjectId()));
|
||||
player.sendPacket(new FriendRemove(activeChar.getName(), 1));
|
||||
}
|
||||
player.sendPacket(new FriendList(player));
|
||||
activeChar.sendPacket(new FriendList(activeChar));
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
@ -86,7 +86,7 @@ public final class RequestFriendInvite extends L2GameClientPacket
|
||||
}
|
||||
|
||||
// Target already in friend list.
|
||||
if (activeChar.getFriendList().contains(friend.getObjectId()))
|
||||
if (activeChar.getFriendList().containsKey(friend.getObjectId()))
|
||||
{
|
||||
sm = SystemMessage.getSystemMessage(SystemMessageId.THIS_PLAYER_IS_ALREADY_REGISTERED_ON_YOUR_FRIENDS_LIST);
|
||||
sm.addString(_name);
|
||||
|
@ -55,7 +55,7 @@ public final class RequestFriendList extends L2GameClientPacket
|
||||
activeChar.sendPacket(SystemMessageId.FRIENDS_LIST);
|
||||
|
||||
L2PcInstance friend = null;
|
||||
for (int id : activeChar.getFriendList())
|
||||
for (int id : activeChar.getFriendList().keySet())
|
||||
{
|
||||
// int friendId = rset.getInt("friendId");
|
||||
String friendName = CharNameTable.getInstance().getNameById(id);
|
||||
|
@ -63,7 +63,7 @@ public final class RequestSendFriendMsg extends L2GameClientPacket
|
||||
}
|
||||
|
||||
final L2PcInstance targetPlayer = L2World.getInstance().getPlayer(_reciever);
|
||||
if ((targetPlayer == null) || !targetPlayer.getFriendList().contains(activeChar.getObjectId()))
|
||||
if ((targetPlayer == null) || !targetPlayer.getFriendList().containsKey(activeChar.getObjectId()))
|
||||
{
|
||||
activeChar.sendPacket(SystemMessageId.THAT_PLAYER_IS_NOT_ONLINE);
|
||||
return;
|
||||
|
@ -0,0 +1,54 @@
|
||||
/*
|
||||
* Copyright (C) 2004-2015 L2J Server
|
||||
*
|
||||
* This file is part of L2J Server.
|
||||
*
|
||||
* L2J Server is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* L2J Server is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.clientpackets.friend;
|
||||
|
||||
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket;
|
||||
import com.l2jserver.gameserver.network.serverpackets.friend.BlockListPacket;
|
||||
|
||||
public final class RequestUpdateBlockMemo extends L2GameClientPacket
|
||||
{
|
||||
private static final String _C__D0_96_REQUESTUPDATEBLOCKMEMO = "[C] D0:96 RequestUpdateBlockMemo";
|
||||
|
||||
private String cName;
|
||||
private String memo;
|
||||
|
||||
@Override
|
||||
protected void readImpl()
|
||||
{
|
||||
cName = readS();
|
||||
memo = readS();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void runImpl()
|
||||
{
|
||||
L2PcInstance player = getClient().getActiveChar();
|
||||
player.getBlockList().setBlockMemo(CharNameTable.getInstance().getIdByName(cName), memo);
|
||||
player.sendPacket(new BlockListPacket(player));
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
return _C__D0_96_REQUESTUPDATEBLOCKMEMO;
|
||||
}
|
||||
|
||||
}
|
@ -16,33 +16,37 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.List;
|
||||
package com.l2jserver.gameserver.network.clientpackets.friend;
|
||||
|
||||
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket;
|
||||
|
||||
/**
|
||||
* @author Sdw
|
||||
*/
|
||||
public class BlockListPacket extends L2GameServerPacket
|
||||
public final class RequestUpdateFriendMemo extends L2GameClientPacket
|
||||
{
|
||||
private final List<Integer> _playersId;
|
||||
private static final String _C__D0_95_REQUESTUPDATEFRIENDMEMO = "[C] D0:95 RequestUpdateFriendMemo";
|
||||
String cName;
|
||||
String memo;
|
||||
|
||||
public BlockListPacket(List<Integer> playersId)
|
||||
@Override
|
||||
protected void readImpl()
|
||||
{
|
||||
_playersId = playersId;
|
||||
cName = readS();
|
||||
memo = readS();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void writeImpl()
|
||||
protected void runImpl()
|
||||
{
|
||||
writeC(0xD5);
|
||||
writeD(_playersId.size());
|
||||
for (int playerId : _playersId)
|
||||
{
|
||||
writeS(CharNameTable.getInstance().getNameById(playerId));
|
||||
writeS(""); // memo ?
|
||||
}
|
||||
L2PcInstance player = getClient().getActiveChar();
|
||||
int id = CharNameTable.getInstance().getIdByName(cName);
|
||||
player.getFriend(id).setMemo(memo);
|
||||
player.updateMemo(id);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getType()
|
||||
{
|
||||
return _C__D0_95_REQUESTUPDATEFRIENDMEMO;
|
||||
}
|
||||
}
|
@ -52,7 +52,7 @@ public final class CreatureSay extends L2GameServerPacket
|
||||
_charLevel = sender.getLevel();
|
||||
_textType = messageType;
|
||||
_text = text;
|
||||
if (receiver.getFriendList().contains(sender.getObjectId()))
|
||||
if (receiver.getFriendList().containsKey(sender.getObjectId()))
|
||||
{
|
||||
_mask |= 0x01;
|
||||
}
|
||||
|
@ -85,7 +85,8 @@ public final class RelationChanged extends L2GameServerPacket
|
||||
{
|
||||
if (activeChar.isInvisible())
|
||||
{
|
||||
throw new IllegalArgumentException("Cannot add insivisble character to multi relation packet");
|
||||
_log.severe("Cannot add insivisble character to multi relation packet");
|
||||
return;
|
||||
}
|
||||
Relation r = new Relation();
|
||||
r._objId = activeChar.getObjectId();
|
||||
|
@ -39,7 +39,7 @@ public final class TradeStart extends AbstractItemPacket
|
||||
|
||||
if (_partner != null)
|
||||
{
|
||||
if (player.getFriendList().contains(_partner.getObjectId()))
|
||||
if (player.getFriendList().containsKey(_partner.getObjectId()))
|
||||
{
|
||||
_mask |= 0x01;
|
||||
}
|
||||
|
@ -0,0 +1,47 @@
|
||||
/*
|
||||
* This program is free software: you can redistribute it and/or modify it under
|
||||
* the terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, either version 3 of the License, or (at your option) any later
|
||||
* version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
|
||||
* FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
|
||||
* details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets.friend;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
|
||||
|
||||
/**
|
||||
* @author Erlandys
|
||||
*/
|
||||
public class BlockListPacket extends L2GameServerPacket
|
||||
{
|
||||
private final L2PcInstance player;
|
||||
|
||||
public BlockListPacket(L2PcInstance activeChar)
|
||||
{
|
||||
player = activeChar;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void writeImpl()
|
||||
{
|
||||
writeC(0xD5);
|
||||
writeD(player.getBlockList().getBlockList().size());
|
||||
for (Map.Entry<Integer, String> entry : player.getBlockList().getBlockList().entrySet())
|
||||
{
|
||||
writeS(CharNameTable.getInstance().getNameById(entry.getKey()));
|
||||
writeS(entry.getValue());
|
||||
}
|
||||
|
||||
}
|
||||
}
|
@ -20,8 +20,9 @@ package com.l2jserver.gameserver.network.serverpackets.friend;
|
||||
|
||||
import java.util.Calendar;
|
||||
|
||||
import com.l2jserver.gameserver.model.L2World;
|
||||
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.model.entity.Friend;
|
||||
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
|
||||
|
||||
/**
|
||||
@ -45,42 +46,47 @@ public class ExFriendDetailInfo extends L2GameServerPacket
|
||||
writeH(0xEC);
|
||||
|
||||
writeD(_player.getObjectId());
|
||||
Friend friend = _player.getFriend(CharNameTable.getInstance().getIdByName(_name));
|
||||
|
||||
L2PcInstance friend = L2World.getInstance().getPlayer(_name);
|
||||
if (friend == null)
|
||||
L2PcInstance player = friend.getFriend();
|
||||
if (player == null)
|
||||
{
|
||||
writeS(_name);
|
||||
writeD(0);
|
||||
writeD(0);
|
||||
writeH(0);
|
||||
writeH(0);
|
||||
writeD(0);
|
||||
writeD(0);
|
||||
writeS("");
|
||||
writeD(0);
|
||||
writeD(0);
|
||||
writeS("");
|
||||
writeD(0);
|
||||
writeS(""); // memo
|
||||
writeD(0x00);
|
||||
writeD(0x00);
|
||||
writeH(friend.getLevel());
|
||||
writeH(friend.getClassId());
|
||||
writeD(friend.getClanId());
|
||||
writeD(friend.getClanCrestId());
|
||||
writeS(friend.getClanName());
|
||||
writeD(friend.getAllyId());
|
||||
writeD(friend.getAllyCrestId());
|
||||
writeS(friend.getAllyName());
|
||||
Calendar createDate = Calendar.getInstance();
|
||||
createDate.setTimeInMillis(friend.getCreateDate());
|
||||
writeC(createDate.get(Calendar.MONTH) + 1);
|
||||
writeC(createDate.get(Calendar.DAY_OF_MONTH));
|
||||
writeD((int) ((System.currentTimeMillis() - friend.getLastLogin()) / 1000));
|
||||
writeS(friend.getMemo()); // memo
|
||||
}
|
||||
else
|
||||
{
|
||||
writeS(friend.getName());
|
||||
writeD(friend.isOnlineInt());
|
||||
writeD(friend.getObjectId());
|
||||
writeH(friend.getLevel());
|
||||
writeH(friend.getClassIndex());
|
||||
writeD(friend.getClanId());
|
||||
writeD(friend.getClanCrestId());
|
||||
writeS(friend.getClan() != null ? friend.getClan().getName() : "");
|
||||
writeD(friend.getAllyId());
|
||||
writeD(friend.getAllyCrestId());
|
||||
writeS(friend.getClan() != null ? friend.getClan().getAllyName() : "");
|
||||
Calendar createDate = friend.getCreateDate();
|
||||
writeC(createDate.get(Calendar.MONTH));
|
||||
writeS(player.getName());
|
||||
writeD(player.isOnlineInt());
|
||||
writeD(player.getObjectId());
|
||||
writeH(player.getLevel());
|
||||
writeH(player.getClassId().getId());
|
||||
writeD(player.getClanId());
|
||||
writeD(player.getClanCrestId());
|
||||
writeS(player.getClan() != null ? player.getClan().getName() : "");
|
||||
writeD(player.getAllyId());
|
||||
writeD(player.getAllyCrestId());
|
||||
writeS(player.getClan() != null ? player.getClan().getAllyName() : "");
|
||||
Calendar createDate = player.getCreateDate();
|
||||
writeC(createDate.get(Calendar.MONTH) + 1);
|
||||
writeC(createDate.get(Calendar.DAY_OF_MONTH));
|
||||
writeD(friend.isOnline() ? (int) System.currentTimeMillis() : (int) (System.currentTimeMillis() - friend.getLastAccess()) / 1000);
|
||||
writeS(""); // memo
|
||||
writeD(player.isOnline() ? -1 : (int) ((System.currentTimeMillis() - player.getLastAccess()) / 1000));
|
||||
writeS(friend.getMemo()); // memo
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -18,104 +18,52 @@
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets.friend;
|
||||
|
||||
import java.sql.Connection;
|
||||
import java.sql.PreparedStatement;
|
||||
import java.sql.ResultSet;
|
||||
import java.util.List;
|
||||
import java.util.Collection;
|
||||
|
||||
import javolution.util.FastList;
|
||||
|
||||
import com.l2jserver.L2DatabaseFactory;
|
||||
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
|
||||
import com.l2jserver.gameserver.model.L2World;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.model.entity.Friend;
|
||||
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
|
||||
|
||||
/**
|
||||
* Support for "Chat with Friends" dialog. <br />
|
||||
* This packet is sent only at login.
|
||||
* @author mrTJO, UnAfraid
|
||||
* @author Erlandys
|
||||
*/
|
||||
public class FriendList extends L2GameServerPacket
|
||||
{
|
||||
private final List<FriendInfo> _info;
|
||||
|
||||
private static class FriendInfo
|
||||
{
|
||||
int _objId;
|
||||
String _name;
|
||||
boolean _online;
|
||||
int _classid;
|
||||
int _level;
|
||||
|
||||
public FriendInfo(int objId, String name, boolean online, int classid, int level)
|
||||
{
|
||||
_objId = objId;
|
||||
_name = name;
|
||||
_online = online;
|
||||
_classid = classid;
|
||||
_level = level;
|
||||
}
|
||||
}
|
||||
Collection<Friend> _friends;
|
||||
|
||||
public FriendList(L2PcInstance player)
|
||||
{
|
||||
_info = new FastList<>(player.getFriendList().size());
|
||||
for (int objId : player.getFriendList())
|
||||
{
|
||||
String name = CharNameTable.getInstance().getNameById(objId);
|
||||
L2PcInstance player1 = L2World.getInstance().getPlayer(objId);
|
||||
|
||||
boolean online = false;
|
||||
int classid = 0;
|
||||
int level = 0;
|
||||
|
||||
if (player1 == null)
|
||||
{
|
||||
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
|
||||
PreparedStatement statement = con.prepareStatement("SELECT char_name, online, classid, level FROM characters WHERE charId = ?"))
|
||||
{
|
||||
statement.setInt(1, objId);
|
||||
try (ResultSet rset = statement.executeQuery())
|
||||
{
|
||||
if (rset.next())
|
||||
{
|
||||
_info.add(new FriendInfo(objId, rset.getString(1), rset.getInt(2) == 1, rset.getInt(3), rset.getInt(4)));
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// Who cares?
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
if (player1.isOnline())
|
||||
{
|
||||
online = true;
|
||||
}
|
||||
|
||||
classid = player1.getClassId().getId();
|
||||
level = player1.getLevel();
|
||||
|
||||
_info.add(new FriendInfo(objId, name, online, classid, level));
|
||||
}
|
||||
_friends = player.getFriendList().values();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void writeImpl()
|
||||
{
|
||||
writeC(0x58);
|
||||
writeD(_info.size());
|
||||
for (FriendInfo info : _info)
|
||||
writeD(_friends.size());
|
||||
for (Friend friend : _friends)
|
||||
{
|
||||
writeD(info._objId); // character id
|
||||
writeS(info._name);
|
||||
writeD(info._online ? 0x01 : 0x00); // online
|
||||
writeD(info._online ? info._objId : 0x00); // object id if online
|
||||
writeD(info._classid);
|
||||
writeD(info._level);
|
||||
L2PcInstance player = friend.getFriend();
|
||||
if (player != null)
|
||||
{
|
||||
writeD(player.getObjectId());
|
||||
writeS(player.getName());
|
||||
writeD(0x01);
|
||||
writeD(player.getObjectId());
|
||||
writeD(player.getLevel());
|
||||
writeD(player.getClassId().getId());
|
||||
writeS("testing");
|
||||
}
|
||||
else
|
||||
{
|
||||
writeD(friend.getFriendOID());
|
||||
writeS(friend.getName());
|
||||
writeD(0x00);
|
||||
writeD(0x00);
|
||||
writeD(friend.getLevel());
|
||||
writeD(friend.getClassId());
|
||||
writeS("testing");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -18,81 +18,50 @@
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets.friend;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Collection;
|
||||
|
||||
import javolution.util.FastList;
|
||||
|
||||
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
|
||||
import com.l2jserver.gameserver.model.L2World;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.model.entity.Friend;
|
||||
import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
|
||||
|
||||
/**
|
||||
* Support for "Chat with Friends" dialog. <br />
|
||||
* This packet is sent only at login.
|
||||
* @author Tempy
|
||||
* @author Erlandys
|
||||
*/
|
||||
public class L2FriendList extends L2GameServerPacket
|
||||
{
|
||||
private final List<FriendInfo> _info;
|
||||
|
||||
private static class FriendInfo
|
||||
{
|
||||
int _objId;
|
||||
String _name;
|
||||
int _level;
|
||||
int _classId;
|
||||
boolean _online;
|
||||
|
||||
public FriendInfo(int objId, String name, boolean online, int level, int classId)
|
||||
{
|
||||
_objId = objId;
|
||||
_name = name;
|
||||
_online = online;
|
||||
_level = level;
|
||||
_classId = classId;
|
||||
}
|
||||
}
|
||||
Collection<Friend> _friends;
|
||||
|
||||
public L2FriendList(L2PcInstance player)
|
||||
{
|
||||
_info = new FastList<>(player.getFriendList().size());
|
||||
for (int objId : player.getFriendList())
|
||||
{
|
||||
String name = CharNameTable.getInstance().getNameById(objId);
|
||||
L2PcInstance player1 = L2World.getInstance().getPlayer(objId);
|
||||
boolean online = false;
|
||||
int level = 0;
|
||||
int classId = 0;
|
||||
|
||||
if (player1 != null)
|
||||
{
|
||||
online = true;
|
||||
level = player1.getLevel();
|
||||
classId = player1.getClassId().getId();
|
||||
}
|
||||
else
|
||||
{
|
||||
level = CharNameTable.getInstance().getLevelById(objId);
|
||||
classId = CharNameTable.getInstance().getClassIdById(objId);
|
||||
}
|
||||
_info.add(new FriendInfo(objId, name, online, level, classId));
|
||||
}
|
||||
_friends = player.getFriendList().values();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected final void writeImpl()
|
||||
{
|
||||
writeC(0x75);
|
||||
writeD(_info.size());
|
||||
for (FriendInfo info : _info)
|
||||
writeD(_friends.size());
|
||||
for (Friend friend : _friends)
|
||||
{
|
||||
writeD(info._objId); // character id
|
||||
writeS(info._name);
|
||||
writeD(info._online ? 0x01 : 0x00); // online
|
||||
writeD(info._online ? info._objId : 0x00); // object id if online
|
||||
writeD(info._level);
|
||||
writeD(info._classId);
|
||||
L2PcInstance player = friend.getFriend();
|
||||
if (player != null)
|
||||
{
|
||||
writeD(player.getObjectId());
|
||||
writeS(player.getName());
|
||||
writeD(0x01);
|
||||
writeD(player.getObjectId());
|
||||
writeD(player.getLevel());
|
||||
writeD(player.getClassId().getId());
|
||||
}
|
||||
else
|
||||
{
|
||||
writeD(friend.getFriendOID());
|
||||
writeS(friend.getName());
|
||||
writeD(0x00);
|
||||
writeD(0x00);
|
||||
writeD(friend.getLevel());
|
||||
writeD(friend.getClassId());
|
||||
}
|
||||
writeH(0x00);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user