Sync with L2jServer HighFive Mar 25th 2015.
This commit is contained in:
@ -42,7 +42,7 @@ public class CharSelectionInfo extends L2GameServerPacket
|
||||
private final String _loginName;
|
||||
private final int _sessionId;
|
||||
private int _activeId;
|
||||
private final CharSelectInfoPackage[] _characterPackages;
|
||||
private final List<CharSelectInfoPackage> _characterPackages;
|
||||
|
||||
/**
|
||||
* Constructor for CharSelectionInfo.
|
||||
@ -65,7 +65,7 @@ public class CharSelectionInfo extends L2GameServerPacket
|
||||
_activeId = activeId;
|
||||
}
|
||||
|
||||
public CharSelectInfoPackage[] getCharInfo()
|
||||
public List<CharSelectInfoPackage> getCharInfo()
|
||||
{
|
||||
return _characterPackages;
|
||||
}
|
||||
@ -74,7 +74,7 @@ public class CharSelectionInfo extends L2GameServerPacket
|
||||
protected final void writeImpl()
|
||||
{
|
||||
writeC(0x09); // packet id
|
||||
int size = _characterPackages.length;
|
||||
int size = (_characterPackages.size());
|
||||
writeD(size); // How many char there is on this account
|
||||
|
||||
// Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) )
|
||||
@ -89,9 +89,10 @@ public class CharSelectionInfo extends L2GameServerPacket
|
||||
{
|
||||
for (int i = 0; i < size; i++)
|
||||
{
|
||||
if (lastAccess < _characterPackages[i].getLastAccess())
|
||||
final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i);
|
||||
if (lastAccess < charInfoPackage.getLastAccess())
|
||||
{
|
||||
lastAccess = _characterPackages[i].getLastAccess();
|
||||
lastAccess = charInfoPackage.getLastAccess();
|
||||
_activeId = i;
|
||||
}
|
||||
}
|
||||
@ -99,7 +100,7 @@ public class CharSelectionInfo extends L2GameServerPacket
|
||||
|
||||
for (int i = 0; i < size; i++)
|
||||
{
|
||||
CharSelectInfoPackage charInfoPackage = _characterPackages[i];
|
||||
final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i);
|
||||
|
||||
writeS(charInfoPackage.getName()); // char name
|
||||
writeD(charInfoPackage.getObjectId()); // char id
|
||||
@ -197,11 +198,9 @@ public class CharSelectionInfo extends L2GameServerPacket
|
||||
}
|
||||
}
|
||||
|
||||
private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName)
|
||||
private static List<CharSelectInfoPackage> loadCharacterSelectInfo(String loginName)
|
||||
{
|
||||
CharSelectInfoPackage charInfopackage;
|
||||
List<CharSelectInfoPackage> characterList = new ArrayList<>();
|
||||
|
||||
final List<CharSelectInfoPackage> characterList = new ArrayList<>();
|
||||
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
|
||||
PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate"))
|
||||
{
|
||||
@ -210,20 +209,19 @@ public class CharSelectionInfo extends L2GameServerPacket
|
||||
{
|
||||
while (charList.next())// fills the package
|
||||
{
|
||||
charInfopackage = restoreChar(charList);
|
||||
CharSelectInfoPackage charInfopackage = restoreChar(charList);
|
||||
if (charInfopackage != null)
|
||||
{
|
||||
characterList.add(charInfopackage);
|
||||
}
|
||||
}
|
||||
}
|
||||
return characterList.toArray(new CharSelectInfoPackage[characterList.size()]);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
_log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e);
|
||||
}
|
||||
return new CharSelectInfoPackage[0];
|
||||
return characterList;
|
||||
}
|
||||
|
||||
private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int ObjectId, int activeClassId)
|
||||
|
@ -19,6 +19,7 @@
|
||||
package com.l2jserver.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
|
||||
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
|
||||
@ -26,7 +27,7 @@ import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
|
||||
|
||||
public final class ExEnchantSkillInfo extends L2GameServerPacket
|
||||
{
|
||||
private final ArrayList<Integer> _routes; // skill lvls for each route
|
||||
private final List<Integer> _routes = new ArrayList<>(); // skill lvls for each route
|
||||
|
||||
private final int _id;
|
||||
private final int _lvl;
|
||||
@ -34,7 +35,6 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket
|
||||
|
||||
public ExEnchantSkillInfo(int id, int lvl)
|
||||
{
|
||||
_routes = new ArrayList<>();
|
||||
_id = id;
|
||||
_lvl = lvl;
|
||||
|
||||
|
@ -18,7 +18,6 @@
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.Map.Entry;
|
||||
|
||||
import com.l2jserver.gameserver.model.L2PremiumItem;
|
||||
@ -31,12 +30,9 @@ public class ExGetPremiumItemList extends L2GameServerPacket
|
||||
{
|
||||
private final L2PcInstance _activeChar;
|
||||
|
||||
private final Map<Integer, L2PremiumItem> _map;
|
||||
|
||||
public ExGetPremiumItemList(L2PcInstance activeChar)
|
||||
{
|
||||
_activeChar = activeChar;
|
||||
_map = _activeChar.getPremiumItemList();
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -44,8 +40,8 @@ public class ExGetPremiumItemList extends L2GameServerPacket
|
||||
{
|
||||
writeC(0xFE);
|
||||
writeH(0x87);
|
||||
writeD(_map.size());
|
||||
for (Entry<Integer, L2PremiumItem> entry : _map.entrySet())
|
||||
writeD(_activeChar.getPremiumItemList().size());
|
||||
for (Entry<Integer, L2PremiumItem> entry : _activeChar.getPremiumItemList().entrySet())
|
||||
{
|
||||
L2PremiumItem item = entry.getValue();
|
||||
writeQ(entry.getKey());
|
||||
|
@ -18,7 +18,7 @@
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
|
||||
import com.l2jserver.gameserver.model.FortSiegeSpawn;
|
||||
@ -47,7 +47,7 @@ public class ExShowFortressMapInfo extends L2GameServerPacket
|
||||
writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status
|
||||
writeD(_fortress.getFortSize()); // barracks count
|
||||
|
||||
ArrayList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
|
||||
List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
|
||||
if ((commanders != null) && (commanders.size() != 0) && _fortress.getSiege().isInProgress())
|
||||
{
|
||||
switch (commanders.size())
|
||||
|
@ -18,7 +18,7 @@
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
|
||||
import com.l2jserver.gameserver.model.FortSiegeSpawn;
|
||||
@ -41,7 +41,7 @@ public class ExShowFortressSiegeInfo extends L2GameServerPacket
|
||||
{
|
||||
_fortId = fort.getResidenceId();
|
||||
_size = fort.getFortSize();
|
||||
ArrayList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId);
|
||||
List<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId);
|
||||
_csize = ((commanders == null) ? 0 : commanders.size());
|
||||
_csize2 = fort.getSiege().getCommanders().size();
|
||||
}
|
||||
|
@ -18,6 +18,8 @@
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.l2jserver.gameserver.model.L2Clan;
|
||||
import com.l2jserver.gameserver.model.skills.Skill;
|
||||
|
||||
@ -27,7 +29,7 @@ import com.l2jserver.gameserver.model.skills.Skill;
|
||||
public class PledgeSkillList extends L2GameServerPacket
|
||||
{
|
||||
private final Skill[] _skills;
|
||||
private final SubPledgeSkill[] _subSkills;
|
||||
private final List<SubPledgeSkill> _subSkills;
|
||||
|
||||
public static class SubPledgeSkill
|
||||
{
|
||||
@ -56,7 +58,7 @@ public class PledgeSkillList extends L2GameServerPacket
|
||||
writeC(0xfE);
|
||||
writeH(0x3A);
|
||||
writeD(_skills.length);
|
||||
writeD(_subSkills.length); // Squad skill length
|
||||
writeD(_subSkills.size()); // Squad skill length
|
||||
for (Skill sk : _skills)
|
||||
{
|
||||
writeD(sk.getDisplayId());
|
||||
|
@ -18,18 +18,16 @@
|
||||
*/
|
||||
package com.l2jserver.gameserver.network.serverpackets;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import com.l2jserver.gameserver.model.TradeItem;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
|
||||
/**
|
||||
* This class ...
|
||||
* @version $Revision: 1.7.2.2.2.3 $ $Date: 2005/03/27 15:29:39 $
|
||||
*/
|
||||
public class PrivateStoreListBuy extends AbstractItemPacket
|
||||
{
|
||||
private final int _objId;
|
||||
private final long _playerAdena;
|
||||
private final TradeItem[] _items;
|
||||
private final List<TradeItem> _items;
|
||||
|
||||
public PrivateStoreListBuy(L2PcInstance player, L2PcInstance storePlayer)
|
||||
{
|
||||
@ -46,7 +44,7 @@ public class PrivateStoreListBuy extends AbstractItemPacket
|
||||
writeD(_objId);
|
||||
writeQ(_playerAdena);
|
||||
writeD(0x00); // unk
|
||||
writeD(_items.length);
|
||||
writeD(_items.size());
|
||||
|
||||
for (TradeItem item : _items)
|
||||
{
|
||||
|
@ -112,7 +112,6 @@ public final class RelationChanged extends L2GameServerPacket
|
||||
{
|
||||
writeRelation(r);
|
||||
}
|
||||
// _multi.clear();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -26,10 +26,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
|
||||
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
|
||||
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
|
||||
|
||||
/**
|
||||
* This class ...
|
||||
* @version $Revision: 1.4.2.3.2.4 $ $Date: 2005/03/27 15:29:39 $
|
||||
*/
|
||||
public class SellList extends L2GameServerPacket
|
||||
{
|
||||
private final L2PcInstance _activeChar;
|
||||
|
Reference in New Issue
Block a user