diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java index 2c6bfb384b..9639fe07bc 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/AuthLogin.java @@ -50,7 +50,7 @@ public class AuthLogin extends ClientBasePacket if (sessionKey != key2) { _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 { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java index 699427b435..f329c384a6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillInfo.java @@ -17,11 +17,12 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; public class AquireSkillInfo extends ServerBasePacket { - private final Vector _reqs = new Vector<>(); + private final List _reqs = new ArrayList<>(); private final int _id; private final int _level; private final int _spCost; @@ -46,13 +47,12 @@ public class AquireSkillInfo extends ServerBasePacket writeD(_level); writeD(_spCost); writeD(_reqs.size()); - for (int i = 0; i < _reqs.size(); ++i) + for (Req req : _reqs) { - final Req temp = _reqs.get(i); - writeD(temp.type); - writeD(temp.id); - writeD(temp.count); - writeD(temp.unk); + writeD(req.type); + writeD(req.id); + writeD(req.count); + writeD(req.unk); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java index 0ee63d8614..14b2e0d799 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/AquireSkillList.java @@ -17,11 +17,12 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; public class AquireSkillList extends ServerBasePacket { - private final Vector _skills = new Vector<>(); + private final List _skills = new ArrayList<>(); public void addSkill(int id, int nextLevel, int maxLevel, int spCost, int requirements) { @@ -33,14 +34,13 @@ public class AquireSkillList extends ServerBasePacket { writeC(0xA3); writeD(_skills.size()); - for (int i = 0; i < _skills.size(); ++i) + for (Skill skill : _skills) { - final Skill temp = _skills.get(i); - writeD(temp.id); - writeD(temp.nextLevel); - writeD(temp.maxLevel); - writeD(temp.spCost); - writeD(temp.requirements); + writeD(skill.id); + writeD(skill.nextLevel); + writeD(skill.maxLevel); + writeD(skill.spCost); + writeD(skill.requirements); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java index 75521bfb3c..e2913187e4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/CharTemplates.java @@ -17,13 +17,14 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; import org.l2jmobius.gameserver.templates.CharTemplate; public class CharTemplates extends ServerBasePacket { - private final Vector _chars = new Vector<>(); + private final List _chars = new ArrayList<>(); public void addChar(CharTemplate template) { @@ -35,28 +36,27 @@ public class CharTemplates extends ServerBasePacket { writeC(0x23); writeD(_chars.size()); - for (int i = 0; i < _chars.size(); ++i) + for (CharTemplate charTemplate : _chars) { - final CharTemplate temp = _chars.get(i); - writeD(temp.getRaceId()); - writeD(temp.getClassId()); + writeD(charTemplate.getRaceId()); + writeD(charTemplate.getClassId()); writeD(70); - writeD(temp.getStr()); + writeD(charTemplate.getStr()); writeD(10); writeD(70); - writeD(temp.getDex()); + writeD(charTemplate.getDex()); writeD(10); writeD(70); - writeD(temp.getCon()); + writeD(charTemplate.getCon()); writeD(10); writeD(70); - writeD(temp.getInt()); + writeD(charTemplate.getInt()); writeD(10); writeD(70); - writeD(temp.getWit()); + writeD(charTemplate.getWit()); writeD(10); writeD(70); - writeD(temp.getMen()); + writeD(charTemplate.getMen()); writeD(10); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java index 2eccf886aa..b495493364 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/MagicEffectIcons.java @@ -17,11 +17,12 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; public class MagicEffectIcons extends ServerBasePacket { - private final Vector _effects = new Vector<>(); + private final List _effects = new ArrayList<>(); public void addEffect(int skillId, int dat, int duration) { @@ -33,12 +34,11 @@ public class MagicEffectIcons extends ServerBasePacket { writeC(0x97); writeH(_effects.size()); - for (int i = 0; i < _effects.size(); ++i) + for (Effect effect : _effects) { - final Effect temp = _effects.get(i); - writeD(temp.skillId); - writeH(temp.dat); - writeD(temp.duration / 1000); + writeD(effect.skillId); + writeH(effect.dat); + writeD(effect.duration / 1000); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java index 508c1beb4e..5832dcdcc7 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java @@ -17,11 +17,12 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; public class ShortCutInit extends ServerBasePacket { - private final Vector _shortCuts = new Vector<>(); + private final List _shortCuts = new ArrayList<>(); public void addSkillShotCut(int slot, int skillId, int level, int dat2) { @@ -43,17 +44,16 @@ public class ShortCutInit extends ServerBasePacket { writeC(0x57); writeD(_shortCuts.size()); - for (int i = 0; i < _shortCuts.size(); ++i) + for (ShortCut shortcut : _shortCuts) { - final ShortCut temp = _shortCuts.get(i); - writeD(temp.type); - writeD(temp.slot); - writeD(temp.typeId); - if (temp.level > -1) + writeD(shortcut.type); + writeD(shortcut.slot); + writeD(shortcut.typeId); + if (shortcut.level > -1) { - writeD(temp.level); + writeD(shortcut.level); } - writeD(temp.dat2); + writeD(shortcut.dat2); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java index 7e90e09db6..88a28f8217 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SkillList.java @@ -17,11 +17,12 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; public class SkillList extends ServerBasePacket { - private final Vector _skills = new Vector<>(); + private final List _skills = new ArrayList<>(); public void addSkill(int id, int level, boolean passive) { @@ -33,10 +34,9 @@ public class SkillList extends ServerBasePacket { writeC(0x6D); writeD(_skills.size()); - for (int i = 0; i < _skills.size(); ++i) + for (Skill skill : _skills) { - final Skill temp = _skills.get(i); - if (temp.passive) + if (skill.passive) { writeD(1); } @@ -44,8 +44,8 @@ public class SkillList extends ServerBasePacket { writeD(0); } - writeD(temp.level); - writeD(temp.id); + writeD(skill.level); + writeD(skill.id); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java index 0c67d42456..ee26a249bb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/StatusUpdate.java @@ -17,7 +17,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; public class StatusUpdate extends ServerBasePacket { @@ -49,7 +50,7 @@ public class StatusUpdate extends ServerBasePacket public static int KARMA = 27; private final int _objectId; - private final Vector _attributes = new Vector<>(); + private final List _attributes = new ArrayList<>(); public StatusUpdate(int objectId) { @@ -67,11 +68,10 @@ public class StatusUpdate extends ServerBasePacket writeC(0x1A); writeD(_objectId); writeD(_attributes.size()); - for (int i = 0; i < _attributes.size(); ++i) + for (Attribute att : _attributes) { - final Attribute temp = _attributes.get(i); - writeD(temp.id); - writeD(temp.value); + writeD(att.id); + writeD(att.value); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java index aa8551db47..85ed1776a3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SystemMessage.java @@ -17,7 +17,8 @@ */ package org.l2jmobius.gameserver.network.serverpackets; -import java.util.Vector; +import java.util.ArrayList; +import java.util.List; public class SystemMessage extends ServerBasePacket { @@ -121,8 +122,8 @@ public class SystemMessage extends ServerBasePacket private static final int TYPE_SKILL_NAME = 4; private final int _messageId; - private final Vector _types = new Vector<>(); - private final Vector _values = new Vector<>(); + private final List _types = new ArrayList<>(); + private final List _values = new ArrayList<>(); public SystemMessage(int messageId) {