lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaced Vector with List.

Browse Source
This commit is contained in:
MobiusDevelopment 2019-11-25 01:42:58 +00:00
parent 14aedd35fb
commit deaecd7678
9 changed files with 64 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java
View File

@ -50,7 +50,7 @@ public class AuthLogin extends ClientBasePacket
if (sessionKey != key2) if (sessionKey != key2)
{ {
_log.warning("session key is not correct. closing connection"); _log.warning("session key is not correct. closing connection");
client.getConnection().sendPacket(new AuthLoginFail(1)); client.getConnection().sendPacket(new AuthLoginFail(AuthLoginFail.SYSTEM_ERROR_LOGIN_LATER));
} }
else else
{ {

16
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java
View File

@ -17,11 +17,12 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
public class AquireSkillInfo extends ServerBasePacket public class AquireSkillInfo extends ServerBasePacket
{ {
private final Vector<Req> _reqs = new Vector<>(); private final List<Req> _reqs = new ArrayList<>();
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final int _spCost;
@ -46,13 +47,12 @@ public class AquireSkillInfo extends ServerBasePacket
writeD(_level); writeD(_level);
writeD(_spCost); writeD(_spCost);
writeD(_reqs.size()); writeD(_reqs.size());
for (int i = 0; i < _reqs.size(); ++i) for (Req req : _reqs)
{ {
final Req temp = _reqs.get(i); writeD(req.type);
writeD(temp.type); writeD(req.id);
writeD(temp.id); writeD(req.count);
writeD(temp.count); writeD(req.unk);
writeD(temp.unk);
} }
} }

18
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java
View File

@ -17,11 +17,12 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
public class AquireSkillList extends ServerBasePacket public class AquireSkillList extends ServerBasePacket
{ {
private final Vector<Skill> _skills = new Vector<>(); private final List<Skill> _skills = new ArrayList<>();
public void addSkill(int id, int nextLevel, int maxLevel, int spCost, int requirements) public void addSkill(int id, int nextLevel, int maxLevel, int spCost, int requirements)
{ {
@ -33,14 +34,13 @@ public class AquireSkillList extends ServerBasePacket
{ {
writeC(0xA3); writeC(0xA3);
writeD(_skills.size()); writeD(_skills.size());
for (int i = 0; i < _skills.size(); ++i) for (Skill skill : _skills)
{ {
final Skill temp = _skills.get(i); writeD(skill.id);
writeD(temp.id); writeD(skill.nextLevel);
writeD(temp.nextLevel); writeD(skill.maxLevel);
writeD(temp.maxLevel); writeD(skill.spCost);
writeD(temp.spCost); writeD(skill.requirements);
writeD(temp.requirements);
} }
} }

24
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java
View File

@ -17,13 +17,14 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.templates.CharTemplate; import org.l2jmobius.gameserver.templates.CharTemplate;
public class CharTemplates extends ServerBasePacket public class CharTemplates extends ServerBasePacket
{ {
private final Vector<CharTemplate> _chars = new Vector<>(); private final List<CharTemplate> _chars = new ArrayList<>();
public void addChar(CharTemplate template) public void addChar(CharTemplate template)
{ {
@ -35,28 +36,27 @@ public class CharTemplates extends ServerBasePacket
{ {
writeC(0x23); writeC(0x23);
writeD(_chars.size()); writeD(_chars.size());
for (int i = 0; i < _chars.size(); ++i) for (CharTemplate charTemplate : _chars)
{ {
final CharTemplate temp = _chars.get(i); writeD(charTemplate.getRaceId());
writeD(temp.getRaceId()); writeD(charTemplate.getClassId());
writeD(temp.getClassId());
writeD(70); writeD(70);
writeD(temp.getStr()); writeD(charTemplate.getStr());
writeD(10); writeD(10);
writeD(70); writeD(70);
writeD(temp.getDex()); writeD(charTemplate.getDex());
writeD(10); writeD(10);
writeD(70); writeD(70);
writeD(temp.getCon()); writeD(charTemplate.getCon());
writeD(10); writeD(10);
writeD(70); writeD(70);
writeD(temp.getInt()); writeD(charTemplate.getInt());
writeD(10); writeD(10);
writeD(70); writeD(70);
writeD(temp.getWit()); writeD(charTemplate.getWit());
writeD(10); writeD(10);
writeD(70); writeD(70);
writeD(temp.getMen()); writeD(charTemplate.getMen());
writeD(10); writeD(10);
} }
} }

14
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java
View File

@ -17,11 +17,12 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
public class MagicEffectIcons extends ServerBasePacket public class MagicEffectIcons extends ServerBasePacket
{ {
private final Vector<Effect> _effects = new Vector<>(); private final List<Effect> _effects = new ArrayList<>();
public void addEffect(int skillId, int dat, int duration) public void addEffect(int skillId, int dat, int duration)
{ {
@ -33,12 +34,11 @@ public class MagicEffectIcons extends ServerBasePacket
{ {
writeC(0x97); writeC(0x97);
writeH(_effects.size()); writeH(_effects.size());
for (int i = 0; i < _effects.size(); ++i) for (Effect effect : _effects)
{ {
final Effect temp = _effects.get(i); writeD(effect.skillId);
writeD(temp.skillId); writeH(effect.dat);
writeH(temp.dat); writeD(effect.duration / 1000);
writeD(temp.duration / 1000);
} }
} }

20
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
View File

@ -17,11 +17,12 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
public class ShortCutInit extends ServerBasePacket public class ShortCutInit extends ServerBasePacket
{ {
private final Vector<ShortCut> _shortCuts = new Vector<>(); private final List<ShortCut> _shortCuts = new ArrayList<>();
public void addSkillShotCut(int slot, int skillId, int level, int dat2) public void addSkillShotCut(int slot, int skillId, int level, int dat2)
{ {
@ -43,17 +44,16 @@ public class ShortCutInit extends ServerBasePacket
{ {
writeC(0x57); writeC(0x57);
writeD(_shortCuts.size()); writeD(_shortCuts.size());
for (int i = 0; i < _shortCuts.size(); ++i) for (ShortCut shortcut : _shortCuts)
{ {
final ShortCut temp = _shortCuts.get(i); writeD(shortcut.type);
writeD(temp.type); writeD(shortcut.slot);
writeD(temp.slot); writeD(shortcut.typeId);
writeD(temp.typeId); if (shortcut.level > -1)
if (temp.level > -1)
{ {
writeD(temp.level); writeD(shortcut.level);
} }
writeD(temp.dat2); writeD(shortcut.dat2);
} }
} }

14
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java
View File

@ -17,11 +17,12 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
public class SkillList extends ServerBasePacket public class SkillList extends ServerBasePacket
{ {
private final Vector<Skill> _skills = new Vector<>(); private final List<Skill> _skills = new ArrayList<>();
public void addSkill(int id, int level, boolean passive) public void addSkill(int id, int level, boolean passive)
{ {
@ -33,10 +34,9 @@ public class SkillList extends ServerBasePacket
{ {
writeC(0x6D); writeC(0x6D);
writeD(_skills.size()); writeD(_skills.size());
for (int i = 0; i < _skills.size(); ++i) for (Skill skill : _skills)
{ {
final Skill temp = _skills.get(i); if (skill.passive)
if (temp.passive)
{ {
writeD(1); writeD(1);
} }
@ -44,8 +44,8 @@ public class SkillList extends ServerBasePacket
{ {
writeD(0); writeD(0);
} }
writeD(temp.level); writeD(skill.level);
writeD(temp.id); writeD(skill.id);
} }
} }

12
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java
View File

@ -17,7 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
public class StatusUpdate extends ServerBasePacket public class StatusUpdate extends ServerBasePacket
{ {
@ -49,7 +50,7 @@ public class StatusUpdate extends ServerBasePacket
public static int KARMA = 27; public static int KARMA = 27;
private final int _objectId; private final int _objectId;
private final Vector<Attribute> _attributes = new Vector<>(); private final List<Attribute> _attributes = new ArrayList<>();
public StatusUpdate(int objectId) public StatusUpdate(int objectId)
{ {
@ -67,11 +68,10 @@ public class StatusUpdate extends ServerBasePacket
writeC(0x1A); writeC(0x1A);
writeD(_objectId); writeD(_objectId);
writeD(_attributes.size()); writeD(_attributes.size());
for (int i = 0; i < _attributes.size(); ++i) for (Attribute att : _attributes)
{ {
final Attribute temp = _attributes.get(i); writeD(att.id);
writeD(temp.id); writeD(att.value);
writeD(temp.value);
} }
} }

7
L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java
View File

@ -17,7 +17,8 @@
*/ */
package org.l2jmobius.gameserver.network.serverpackets; package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Vector; import java.util.ArrayList;
import java.util.List;
public class SystemMessage extends ServerBasePacket public class SystemMessage extends ServerBasePacket
{ {
@ -121,8 +122,8 @@ public class SystemMessage extends ServerBasePacket
private static final int TYPE_SKILL_NAME = 4; private static final int TYPE_SKILL_NAME = 4;
private final int _messageId; private final int _messageId;
private final Vector<Integer> _types = new Vector<>(); private final List<Integer> _types = new ArrayList<>();
private final Vector<Object> _values = new Vector<>(); private final List<Object> _values = new ArrayList<>();
public SystemMessage(int messageId) public SystemMessage(int messageId)
{ {