diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java index 4305e3b463..848c914ef0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java @@ -58,7 +58,7 @@ public class AdminCommands extends Thread private static AdminCommands _instance; private static ClientThread clientShut; private static int secondsShut; - private static Skill[] adminSkills; + private static Collection adminSkills; private static String _characterToManipulate; public static AdminCommands getInstance() @@ -1173,7 +1173,6 @@ public class AdminCommands extends Thread { PlayerInstance activeChar = client.getActiveChar(); PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate); - Skill[] skills = player.getAllSkills(); NpcHtmlMessage adminReply = new NpcHtmlMessage(5); StringBuffer replyMSG = new StringBuffer("Remove skills of " + player.getName() + ""); replyMSG.append(""); @@ -1184,7 +1183,7 @@ public class AdminCommands extends Thread replyMSG.append("
Click on the skill you wish to remove:
"); replyMSG.append("
"); replyMSG.append(""); - for (Skill skill : skills) + for (Skill skill : player.getAllSkills()) { replyMSG.append(""); } @@ -1236,16 +1235,15 @@ public class AdminCommands extends Thread } else { - int i; - Skill[] skills = player.getAllSkills(); + Collection skills = player.getAllSkills(); adminSkills = activeChar.getAllSkills(); - for (i = 0; i < adminSkills.length; ++i) + for (Skill skill : adminSkills) { - activeChar.removeSkill(adminSkills[i]); + activeChar.removeSkill(skill); } - for (i = 0; i < skills.length; ++i) + for (Skill skill : skills) { - activeChar.addSkill(skills[i]); + activeChar.addSkill(skill); } SystemMessage smA = new SystemMessage(614); smA.addString("You now have all the skills of " + player.getName() + "."); @@ -1266,23 +1264,22 @@ public class AdminCommands extends Thread } else { - int i; - Skill[] skills = player.getAllSkills(); - for (i = 0; i < skills.length; ++i) + Collection skills = player.getAllSkills(); + for (Skill skill : skills) { - player.removeSkill(skills[i]); + player.removeSkill(skill); } - for (i = 0; i < activeChar.getAllSkills().length; ++i) + for (Skill skill : activeChar.getAllSkills()) { - player.addSkill(activeChar.getAllSkills()[i]); + player.addSkill(skill); } - for (i = 0; i < skills.length; ++i) + for (Skill skill : skills) { - activeChar.removeSkill(skills[i]); + activeChar.removeSkill(skill); } - for (i = 0; i < adminSkills.length; ++i) + for (Skill skill : adminSkills) { - activeChar.addSkill(adminSkills[i]); + activeChar.addSkill(skill); } SystemMessage sm = new SystemMessage(614); sm.addString("[GM]" + activeChar.getName() + " has updated your skills."); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharTemplateTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharTemplateTable.java index 3a34a28903..3e25db455d 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharTemplateTable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/CharTemplateTable.java @@ -21,6 +21,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStreamReader; import java.io.LineNumberReader; +import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.StringTokenizer; @@ -119,8 +120,8 @@ public class CharTemplateTable return _templates.get(classId); } - public CharTemplate[] getAllTemplates() + public Collection getAllTemplates() { - return _templates.values().toArray(new CharTemplate[_templates.size()]); + return _templates.values(); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTreeTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTreeTable.java index 7fa86af203..13a39a3ff2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTreeTable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTreeTable.java @@ -23,6 +23,8 @@ import java.io.FileNotFoundException; import java.io.InputStreamReader; import java.io.LineNumberReader; import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -215,16 +217,18 @@ public class SkillTreeTable return skill; } - public SkillLearn[] getAvailableSkills(PlayerInstance cha) + public Collection getAvailableSkills(PlayerInstance cha) { List result = new ArrayList<>(); List skills = _skillTrees.get(cha.getClassId()); if (skills == null) { _log.warning("Skilltree for class " + cha.getClassId() + " is not defined !"); - return new SkillLearn[0]; + return Collections.emptyList(); } - Skill[] oldSkills = cha.getAllSkills(); + + // TODO: Remove toArray. + Skill[] oldSkills = cha.getAllSkills().toArray(new Skill[cha.getAllSkills().size()]); for (int i = 0; i < skills.size(); ++i) { SkillLearn temp = skills.get(i); @@ -252,6 +256,6 @@ public class SkillTreeTable } result.add(temp); } - return result.toArray(new SkillLearn[result.size()]); + return result; } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java index 9346a83efb..a8aaf87378 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/managers/CommunityBoardManager.java @@ -120,8 +120,7 @@ public class CommunityBoardManager } htmlCode.append("" + title + ""); htmlCode.append(""); - ClanMember[] members = clan.getMembers(); - for (ClanMember member : members) + for (ClanMember member : clan.getMembers()) { if (member.getName() == clan.getLeaderName()) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java index c7353342ca..24d27d5839 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Clan.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.model; import java.io.File; import java.io.FileWriter; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.Map; @@ -99,25 +100,23 @@ public class Clan _members.remove(name); } - public ClanMember[] getMembers() + public Collection getMembers() { - return _members.values().toArray(new ClanMember[_members.size()]); + return _members.values(); } - public PlayerInstance[] getOnlineMembers(String exclude) + public Collection getOnlineMembers(String exclude) { List result = new ArrayList<>(); - Iterator iter = _members.values().iterator(); - while (iter.hasNext()) + for (ClanMember member : _members.values()) { - ClanMember temp = iter.next(); - if (!temp.isOnline() || temp.getName().equals(exclude)) + if (!member.isOnline() || member.getName().equals(exclude)) { continue; } - result.add(temp.getPlayerInstance()); + result.add(member.getPlayerInstance()); } - return result.toArray(new PlayerInstance[result.size()]); + return result; } public int getAllyId() @@ -191,7 +190,6 @@ public class Clan FileWriter out = null; try { - int i; out = new FileWriter(clanFile); out.write("#clanId;clanName;clanLevel;hasCastle;hasHideout;allianceId;allianceName\r\n"); out.write(getClanId() + ";"); @@ -202,28 +200,27 @@ public class Clan out.write(getAllyId() + ";"); out.write("none\r\n"); out.write("#memberName;memberLevel;classId;objectId\r\n"); - ClanMember[] members = getMembers(); - for (i = 0; i < members.length; ++i) + for (ClanMember member : getMembers()) { - if (members[i].getObjectId() != getLeaderId()) + if (member.getObjectId() != getLeaderId()) { continue; } - out.write(members[i].getName() + ";"); - out.write(members[i].getLevel() + ";"); - out.write(members[i].getClassId() + ";"); - out.write(members[i].getObjectId() + "\r\n"); + out.write(member.getName() + ";"); + out.write(member.getLevel() + ";"); + out.write(member.getClassId() + ";"); + out.write(member.getObjectId() + "\r\n"); } - for (i = 0; i < members.length; ++i) + for (ClanMember member : getMembers()) { - if (members[i].getObjectId() == getLeaderId()) + if (member.getObjectId() == getLeaderId()) { continue; } - out.write(members[i].getName() + ";"); - out.write(members[i].getLevel() + ";"); - out.write(members[i].getClassId() + ";"); - out.write(members[i].getObjectId() + "\r\n"); + out.write(member.getName() + ";"); + out.write(member.getLevel() + ";"); + out.write(member.getClassId() + ";"); + out.write(member.getObjectId() + "\r\n"); } } catch (Exception e) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java index a398e5d910..a7414084db 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Inventory.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model; import java.util.ArrayList; +import java.util.Collection; import java.util.Iterator; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; @@ -56,9 +57,9 @@ public class Inventory return _items.size(); } - public ItemInstance[] getItems() + public Collection getItems() { - return _items.toArray(new ItemInstance[_items.size()]); + return _items; } public ItemInstance addItem(ItemInstance newItem) @@ -131,7 +132,7 @@ public class Inventory refreshWeight(); } - public ItemInstance[] unEquipItemInBodySlot(int slot) + public Collection unEquipItemInBodySlot(int slot) { List unequipedItems = new ArrayList<>(); // _log.fine("--- unequip body slot:" + slot); @@ -196,8 +197,8 @@ public class Inventory } case 16384: { - this.unEquipSlot(unequipedItems, 8); - this.unEquipSlot(7); + unEquipSlot(unequipedItems, 8); + unEquipSlot(7); pdollSlot = 14; break; } @@ -216,21 +217,20 @@ public class Inventory pdollSlot = 0; } } - this.unEquipSlot(unequipedItems, pdollSlot); - return unequipedItems.toArray(new ItemInstance[unequipedItems.size()]); + unEquipSlot(unequipedItems, pdollSlot); + return unequipedItems; } - public ItemInstance[] unEquipItemOnPaperdoll(int pdollSlot) + public Collection unEquipItemOnPaperdoll(int pdollSlot) { List unequipedItems = new ArrayList<>(); - // _log.fine("--- unequip body slot:" + pdollSlot); if (pdollSlot == 14) { - this.unEquipSlot(unequipedItems, 8); - this.unEquipSlot(7); + unEquipSlot(unequipedItems, 8); + unEquipSlot(7); } - this.unEquipSlot(unequipedItems, pdollSlot); - return unequipedItems.toArray(new ItemInstance[unequipedItems.size()]); + unEquipSlot(unequipedItems, pdollSlot); + return unequipedItems; } public List equipItem(ItemInstance item) @@ -242,17 +242,17 @@ public class Inventory case 16384: { ItemInstance arrow; - this.unEquipSlot(changedItems, 8); - ItemInstance old1 = this.unEquipSlot(14); + unEquipSlot(changedItems, 8); + ItemInstance old1 = unEquipSlot(14); if (old1 != null) { changedItems.add(old1); - this.unEquipSlot(7); - this.unEquipSlot(changedItems, 8); + unEquipSlot(7); + unEquipSlot(changedItems, 8); } else { - this.unEquipSlot(changedItems, 7); + unEquipSlot(changedItems, 7); } setPaperdollItem(7, item); setPaperdollItem(14, item); @@ -267,25 +267,25 @@ public class Inventory } case 256: { - ItemInstance old1 = this.unEquipSlot(14); + ItemInstance old1 = unEquipSlot(14); if (old1 != null) { - this.unEquipSlot(changedItems, 7); + unEquipSlot(changedItems, 7); } - this.unEquipSlot(changedItems, 8); + unEquipSlot(changedItems, 8); setPaperdollItem(8, item); break; } case 128: { - if (this.unEquipSlot(changedItems, 14)) + if (unEquipSlot(changedItems, 14)) { - this.unEquipSlot(changedItems, 8); - this.unEquipSlot(7); + unEquipSlot(changedItems, 8); + unEquipSlot(7); } else { - this.unEquipSlot(changedItems, 7); + unEquipSlot(changedItems, 7); } setPaperdollItem(7, item); break; @@ -302,7 +302,7 @@ public class Inventory setPaperdollItem(2, item); break; } - this.unEquipSlot(changedItems, 1); + unEquipSlot(changedItems, 1); setPaperdollItem(1, item); break; } @@ -318,26 +318,26 @@ public class Inventory setPaperdollItem(5, item); break; } - this.unEquipSlot(changedItems, 4); + unEquipSlot(changedItems, 4); setPaperdollItem(4, item); break; } case 8: { - this.unEquipSlot(changedItems, 3); + unEquipSlot(changedItems, 3); setPaperdollItem(3, item); break; } case 32768: { - this.unEquipSlot(changedItems, 10); - this.unEquipSlot(changedItems, 11); + unEquipSlot(changedItems, 10); + unEquipSlot(changedItems, 11); setPaperdollItem(10, item); break; } case 1024: { - this.unEquipSlot(changedItems, 10); + unEquipSlot(changedItems, 10); setPaperdollItem(10, item); break; } @@ -346,39 +346,39 @@ public class Inventory ItemInstance chest = getPaperdollItem(10); if ((chest != null) && (chest.getItem().getBodyPart() == 32768)) { - this.unEquipSlot(changedItems, 10); + unEquipSlot(changedItems, 10); } - this.unEquipSlot(changedItems, 11); + unEquipSlot(changedItems, 11); setPaperdollItem(11, item); break; } case 4096: { - this.unEquipSlot(changedItems, 12); + unEquipSlot(changedItems, 12); setPaperdollItem(12, item); break; } case 512: { - this.unEquipSlot(changedItems, 9); + unEquipSlot(changedItems, 9); setPaperdollItem(9, item); break; } case 64: { - this.unEquipSlot(changedItems, 6); + unEquipSlot(changedItems, 6); setPaperdollItem(6, item); break; } case 1: { - this.unEquipSlot(changedItems, 0); + unEquipSlot(changedItems, 0); setPaperdollItem(0, item); break; } case 8192: { - this.unEquipSlot(changedItems, 13); + unEquipSlot(changedItems, 13); setPaperdollItem(13, item); break; } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Party.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Party.java index 81effa0083..d330cabf6c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Party.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/Party.java @@ -57,7 +57,7 @@ public class Party private PlayerInstance getRandomMember() { - return (PlayerInstance) _members.toArray()[Rnd.get(_members.size())]; + return _members.get(Rnd.get(_members.size())); } public boolean isLeader(PlayerInstance player) @@ -67,18 +67,16 @@ public class Party public void broadcastToPartyMembers(ServerBasePacket msg) { - for (int i = 0; i < _members.size(); ++i) + for (PlayerInstance member : _members) { - PlayerInstance member = _members.get(i); member.sendPacket(msg); } } public void broadcastToPartyMembers(PlayerInstance player, ServerBasePacket msg) { - for (int i = 0; i < _members.size(); ++i) + for (PlayerInstance member : _members) { - PlayerInstance member = _members.get(i); if (member.equals(player)) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java index 0f6ad68dbe..19c6cae917 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/World.java @@ -108,8 +108,7 @@ public class World public void removeVisibleObject(WorldObject object) { _visibleObjects.remove(object.getObjectId()); - Object[] temp = object.getKnownObjects().toArray(); - for (Object element : temp) + for (Object element : object.getKnownObjects()) { WorldObject temp1 = (WorldObject) element; temp1.removeKnownObject(object); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java index baf6d4408e..bebc4c66ba 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/WorldObject.java @@ -114,11 +114,10 @@ public class WorldObject implements Serializable public void removeAllKnownObjects() { - WorldObject[] notifyList = _knownObjects.toArray(new WorldObject[_knownObjects.size()]); _knownObjects.clear(); - for (WorldObject element : notifyList) + for (WorldObject object : _knownObjects) { - element.removeKnownObject(this); + object.removeKnownObject(this); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 2ce1795f82..978733a2e9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -321,8 +321,7 @@ public class Attackable extends NpcInstance dropit.setZ(getZ() + 100); dropit.setOnTheGround(true); DropItem dis = new DropItem(dropit, getObjectId()); - Creature[] players = broadcastPacket(dis); - for (Creature player : players) + for (Creature player : broadcastPacket(dis)) { ((PlayerInstance) player).addKnownObjectWithoutCreate(dropit); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index f0c1f993b9..5fce3c24af 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -20,6 +20,7 @@ package org.l2jmobius.gameserver.model.actor; import java.io.PrintWriter; import java.io.StringWriter; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.Timer; @@ -1024,16 +1025,14 @@ public abstract class Creature extends WorldObject return distance; } - public Creature[] broadcastPacket(ServerBasePacket mov) + public Collection broadcastPacket(ServerBasePacket mov) { - Set list = getKnownPlayers(); - Creature[] players = list.toArray(new Creature[list.size()]); - // _log.fine("players to notify:" + players.length + " packet:" + mov.getType()); - for (Creature player : players) + Set nearby = getKnownPlayers(); + for (Creature player : nearby) { player.sendPacket(mov); } - return players; + return nearby; } public void sendPacket(ServerBasePacket mov) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java index 1f6b549f96..8ba05b5d61 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PetInstance.java @@ -426,8 +426,7 @@ public class PetInstance extends Creature try { Inventory petInventory = getInventory(); - ItemInstance[] items = petInventory.getItems(); - for (ItemInstance giveit : items) + for (ItemInstance giveit : petInventory.getItems()) { if (((giveit.getItem().getWeight() * giveit.getCount()) + _owner.getInventory().getTotalWeight()) < _owner.getMaxLoad()) { @@ -515,8 +514,7 @@ public class PetInstance extends Creature { try { - ItemInstance[] items = getInventory().getItems(); - for (ItemInstance item : items) + for (ItemInstance item : getInventory().getItems()) { dropItemHere(item); } @@ -538,8 +536,7 @@ public class PetInstance extends Creature dropit.setZ(getZ() + 100); dropit.setOnTheGround(true); DropItem dis = new DropItem(dropit, getObjectId()); - Creature[] players = broadcastPacket(dis); - for (Creature player : players) + for (Creature player : broadcastPacket(dis)) { ((PlayerInstance) player).addKnownObjectWithoutCreate(dropit); } @@ -596,21 +593,20 @@ public class PetInstance extends Creature { if (getKnownObjects().size() != 0) { - WorldObject[] knownobjects = _knownObjects.toArray(new WorldObject[_knownObjects.size()]); - for (int x = 0; x < knownobjects.length; ++x) + for (WorldObject object : _knownObjects) { - if (!(getDistance(knownobjects[x].getX(), knownobjects[x].getY()) > 4000.0)) + if (!(getDistance(object.getX(), object.getY()) > 4000.0)) { continue; } - if (knownobjects[x] instanceof MonsterInstance) + if (object instanceof MonsterInstance) { - removeKnownObject(knownobjects[x]); - ((MonsterInstance) knownobjects[x]).removeKnownObject(this); + removeKnownObject(object); + ((MonsterInstance) object).removeKnownObject(this); continue; } - removeKnownObject(knownobjects[x]); - knownobjects[x].removeKnownObject(this); + removeKnownObject(object); + object.removeKnownObject(this); } } updateKnownCounter = 0; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0f305be20c..ce37166eac 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -17,6 +17,7 @@ */ package org.l2jmobius.gameserver.model.actor.instance; +import java.util.Collection; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -142,14 +143,14 @@ public class PlayerInstance extends Creature return _skills.remove(skill.getId()); } - public Skill[] getAllSkills() + public Collection getAllSkills() { - return _skills.values().toArray(new Skill[_skills.values().size()]); + return _skills.values(); } - public ShortCut[] getAllShortCuts() + public Collection getAllShortCuts() { - return _shortCuts.values().toArray(new ShortCut[_shortCuts.values().size()]); + return _shortCuts.values(); } public ShortCut getShortCut(int slot) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java index 4adf5e1a0d..a1e2ab3802 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/TrainerInstance.java @@ -51,10 +51,8 @@ public class TrainerInstance extends NpcInstance public void showSkillList(PlayerInstance player) { - _log.fine("SkillList activated on: " + getObjectId()); - SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player); AquireSkillList asl = new AquireSkillList(); - for (SkillLearn skill : skills) + for (SkillLearn skill : SkillTreeTable.getInstance().getAvailableSkills(player)) { asl.addSkill(skill.getId(), skill.getLevel(), skill.getLevel(), skill.getSpCost(), 0); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java index 3dd5e25150..ac17de59a4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java @@ -221,10 +221,9 @@ public class ClientThread extends Thread OutputStreamWriter out = null; try { - ShortCut[] scs = cha.getAllShortCuts(); out = new FileWriter(saveFile); out.write("slot;type;id;level;unknown\r\n"); - for (ShortCut sc : scs) + for (ShortCut sc : cha.getAllShortCuts()) { out.write(sc.getSlot() + ";"); out.write(sc.getType() + ";"); @@ -350,10 +349,9 @@ public class ClientThread extends Thread OutputStreamWriter out = null; try { - ItemInstance[] items = cha.getInventory().getItems(); out = new FileWriter(saveFile); out.write("objectId;itemId;name;count;price;equipSlot;\r\n"); - for (ItemInstance item : items) + for (ItemInstance item : cha.getInventory().getItems()) { out.write(item.getObjectId() + ";"); out.write(item.getItemId() + ";"); @@ -392,10 +390,9 @@ public class ClientThread extends Thread OutputStreamWriter out = null; try { - Skill[] skills = cha.getAllSkills(); out = new FileWriter(saveFile); out.write("skillId;skillLevel;skillName\r\n"); - for (Skill skill : skills) + for (Skill skill : cha.getAllSkills()) { out.write(skill.getId() + ";"); out.write(skill.getLevel() + ";"); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java index f69bfb2ed3..59a19a37f3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/Action.java @@ -62,7 +62,7 @@ public class Action extends ClientBasePacket } else { - _log.warning("object not found, oid " + objectId + " or player is dead"); + // _log.warning("object not found, oid " + objectId + " or player is dead"); activeChar.sendPacket(new ActionFailed()); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index 92939c536a..1f9c53ccd3 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -150,16 +150,14 @@ public class CharacterCreate extends ClientBasePacket newChar.setCollisionHeight(template.getFColH()); } ItemTable itemTable = ItemTable.getInstance(); - Integer[] items = template.getItems(); - for (Integer item2 : items) + for (Integer item2 : template.getItems()) { ItemInstance item = itemTable.createItem(item2); newChar.getInventory().addItem(item); } newChar.setTitle(""); newChar.setClanId(0); - SkillLearn[] startSkills = SkillTreeTable.getInstance().getAvailableSkills(newChar); - for (SkillLearn startSkill : startSkills) + for (SkillLearn startSkill : SkillTreeTable.getInstance().getAvailableSkills(newChar)) { newChar.addSkill(SkillTable.getInstance().getInfo(startSkill.getId(), startSkill.getLevel())); _log.fine("adding starter skill:" + startSkill.getId() + " / " + startSkill.getLevel()); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index e9214815e5..15f2bd42d2 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -49,29 +49,31 @@ public class EnterWorld extends ClientBasePacket } SystemMessage sm = new SystemMessage(34); con.sendPacket(sm); + Announcements.getInstance().showAnnouncements(activeChar); + ItemList il = new ItemList(activeChar, false); activeChar.sendPacket(il); + ShortCutInit sci = new ShortCutInit(); - ShortCut[] shortcuts = activeChar.getAllShortCuts(); - block5: for (ShortCut shortcut : shortcuts) + for (ShortCut shortcut : activeChar.getAllShortCuts()) { switch (shortcut.getType()) { case 3: { sci.addActionShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getUnk()); - continue block5; + continue; } case 2: { sci.addSkillShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getLevel(), shortcut.getUnk()); - continue block5; + continue; } case 1: { sci.addItemShotCut(shortcut.getSlot(), shortcut.getId(), shortcut.getUnk()); - continue block5; + continue; } default: { @@ -80,6 +82,7 @@ public class EnterWorld extends ClientBasePacket } } con.sendPacket(sci); + UserInfo ui = new UserInfo(activeChar); con.sendPacket(ui); if (activeChar.isDead()) @@ -98,8 +101,7 @@ public class EnterWorld extends ClientBasePacket clan.getClanMember(activeChar.getName()).setPlayerInstance(activeChar); SystemMessage msg = new SystemMessage(304); msg.addString(activeChar.getName()); - PlayerInstance[] clanMembers = clan.getOnlineMembers(activeChar.getName()); - for (PlayerInstance clanMember : clanMembers) + for (PlayerInstance clanMember : clan.getOnlineMembers(activeChar.getName())) { clanMember.sendPacket(msg); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index 9a01227650..a34fc21cd6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; +import java.util.Collection; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.SkillTreeTable; @@ -39,11 +40,10 @@ public class RequestAquireSkill extends ClientBasePacket { super(rawPacket); PlayerInstance player = client.getActiveChar(); - // Connection con = client.getConnection(); int id = readD(); int level = readD(); Skill skill = SkillTable.getInstance().getInfo(id, level); - SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player); + Collection skills = SkillTreeTable.getInstance().getAvailableSkills(player); int _requiredSp = 0; for (SkillLearn skill2 : skills) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index 57af88a67f..ec1c091946 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -40,9 +40,8 @@ public class RequestAquireSkillInfo extends ClientBasePacket int id = readD(); int level = readD(); Skill skill = SkillTable.getInstance().getInfo(id, level); - SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(activeChar); int requiredSp = 0; - for (SkillLearn skill2 : skills) + for (SkillLearn skill2 : SkillTreeTable.getInstance().getAvailableSkills(activeChar)) { if (skill2.getId() != id) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java index 5bbc7c4444..0541ffb7c4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDestroyItem.java @@ -48,9 +48,8 @@ public class RequestDestroyItem extends ClientBasePacket } if ((itemToRemove = activeChar.getInventory().getItem(objectId)).isEquipped()) { - ItemInstance[] unequiped = activeChar.getInventory().unEquipItemOnPaperdoll(itemToRemove.getEquipSlot()); iu = new InventoryUpdate(); - for (ItemInstance element : unequiped) + for (ItemInstance element : activeChar.getInventory().unEquipItemOnPaperdoll(itemToRemove.getEquipSlot())) { iu.addModifiedItem(element); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java index f6a05a1b02..f935959587 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestDropItem.java @@ -92,8 +92,7 @@ public class RequestDropItem extends ClientBasePacket DropItem di = new DropItem(dropedItem, activeChar.getObjectId()); activeChar.sendPacket(di); activeChar.addKnownObjectWithoutCreate(dropedItem); - Creature[] players = activeChar.broadcastPacket(di); - for (Creature player : players) + for (Creature player : activeChar.broadcastPacket(di)) { ((PlayerInstance) player).addKnownObjectWithoutCreate(dropedItem); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java index 116eeb81ec..904845060a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestSkillList.java @@ -20,7 +20,6 @@ package org.l2jmobius.gameserver.network.clientpackets; import java.io.IOException; import org.l2jmobius.gameserver.model.Skill; -import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; import org.l2jmobius.gameserver.network.serverpackets.SkillList; @@ -32,9 +31,7 @@ public class RequestSkillList extends ClientBasePacket { super(rawPacket); SkillList response = new SkillList(); - PlayerInstance cha = client.getActiveChar(); - Skill[] skills = cha.getAllSkills(); - for (Skill skill : skills) + for (Skill skill : client.getActiveChar().getAllSkills()) { response.addSkill(skill.getId(), skill.getLevel(), skill.isPassive()); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java index 545eef2a2f..f431cac505 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java @@ -17,6 +17,8 @@ */ package org.l2jmobius.gameserver.network.clientpackets; +import java.util.Collection; + import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; import org.l2jmobius.gameserver.network.ClientThread; @@ -35,7 +37,7 @@ public class RequestUnEquipItem extends ClientBasePacket int slot = readD(); _log.fine("request unequip slot " + slot); PlayerInstance activeChar = client.getActiveChar(); - ItemInstance[] unequiped = activeChar.getInventory().unEquipItemInBodySlot(slot); + Collection unequiped = activeChar.getInventory().unEquipItemInBodySlot(slot); InventoryUpdate iu = new InventoryUpdate(); for (ItemInstance element : unequiped) { @@ -51,10 +53,10 @@ public class RequestUnEquipItem extends ClientBasePacket activeChar.setAttackStatus(false); CharInfo info = new CharInfo(activeChar); activeChar.broadcastPacket(info); - if (unequiped.length > 0) + if (unequiped.size() > 0) { SystemMessage sm = new SystemMessage(417); - sm.addItemName(unequiped[0].getItemId()); + sm.addItemName(unequiped.stream().findFirst().get().getItemId()); activeChar.sendPacket(sm); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java index dffecb4c89..1fd018ec45 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewItemList.java @@ -17,13 +17,15 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class GMViewItemList extends ServerBasePacket { private static final String _S__AD_GMVIEWITEMLIST = "[S] AD GMViewItemList"; - private final ItemInstance[] _items; + private final Collection _items; private final String _playerName; public GMViewItemList(PlayerInstance cha) @@ -38,18 +40,16 @@ public class GMViewItemList extends ServerBasePacket writeC(173); writeS(_playerName); writeH(1); - int count = _items.length; - writeH(count); - for (int i = 0; i < count; ++i) + writeH(_items.size()); + for (ItemInstance item : _items) { - ItemInstance temp = _items[i]; - writeH(temp.getItem().getType1()); - writeD(temp.getObjectId()); - writeD(temp.getItemId()); - writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(item.getItem().getType1()); + writeD(item.getObjectId()); + writeD(item.getItemId()); + writeD(item.getCount()); + writeH(item.getItem().getType2()); writeH(255); - if (temp.isEquipped()) + if (item.isEquipped()) { writeH(1); } @@ -57,8 +57,8 @@ public class GMViewItemList extends ServerBasePacket { writeH(0); } - writeD(temp.getItem().getBodyPart()); - writeH(temp.getEnchantLevel()); + writeD(item.getItem().getBodyPart()); + writeH(item.getEnchantLevel()); writeH(0); } return getBytes(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java index 335394ef1d..d9231e2944 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java @@ -49,9 +49,8 @@ public class GMViewPledgeInfo extends ServerBasePacket writeD(_activeChar.getLevel()); writeD(0); writeD(0); - ClanMember[] members = _clan.getMembers(); - writeD(members.length - 1); - for (ClanMember member : members) + writeD(_clan.getMembers().size() - 1); + for (ClanMember member : _clan.getMembers()) { if (member.getName().equals(_activeChar.getName())) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java index d4d6a105cc..265ed860ea 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ItemList.java @@ -17,13 +17,15 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance; public class ItemList extends ServerBasePacket { private static final String _S__27_ITEMLIST = "[S] 27 ItemList"; - private final ItemInstance[] _items; + private final Collection _items; private final boolean _showWindow; public ItemList(PlayerInstance cha, boolean showWindow) @@ -32,7 +34,7 @@ public class ItemList extends ServerBasePacket _showWindow = showWindow; } - public ItemList(ItemInstance[] items, boolean showWindow) + public ItemList(Collection items, boolean showWindow) { _items = items; _showWindow = showWindow; @@ -50,19 +52,16 @@ public class ItemList extends ServerBasePacket { writeH(0); } - int count = _items.length; - writeH(count); - for (int i = 0; i < count; ++i) + writeH(_items.size()); + for (ItemInstance item : _items) { - ItemInstance temp = _items[i]; - // _log.fine("item:" + temp.getItem().getName() + " type1:" + temp.getItem().getType1() + " type2:" + temp.getItem().getType2()); - writeH(temp.getItem().getType1()); - writeD(temp.getObjectId()); - writeD(temp.getItemId()); - writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(item.getItem().getType1()); + writeD(item.getObjectId()); + writeD(item.getItemId()); + writeD(item.getCount()); + writeH(item.getItem().getType2()); writeH(255); - if (temp.isEquipped()) + if (item.isEquipped()) { writeH(1); } @@ -70,8 +69,8 @@ public class ItemList extends ServerBasePacket { writeH(0); } - writeD(temp.getItem().getBodyPart()); - writeH(temp.getEnchantLevel()); + writeD(item.getItem().getBodyPart()); + writeH(item.getEnchantLevel()); writeH(0); } return getBytes(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java index c12153ae84..d9495b7029 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PetItemList.java @@ -17,37 +17,38 @@ */ package org.l2jmobius.gameserver.network.serverpackets; +import java.util.Collection; + import org.l2jmobius.gameserver.model.actor.instance.ItemInstance; import org.l2jmobius.gameserver.model.actor.instance.PetInstance; public class PetItemList extends ServerBasePacket { private static final String _S__cb_PETITEMLIST = "[S] cb PetItemList"; + private final PetInstance _cha; + private final Collection _items; public PetItemList(PetInstance cha) { _cha = cha; + _items = _cha.getInventory().getItems(); } @Override public byte[] getContent() { writeC(203); - ItemInstance[] items = _cha.getInventory().getItems(); - int count = items.length; - writeH(count); - for (int i = 0; i < count; ++i) + writeH(_items.size()); + for (ItemInstance item : _items) { - ItemInstance temp = items[i]; - // _log.fine("item:" + temp.getItem().getName() + " type1:" + temp.getItem().getType1() + " type2:" + temp.getItem().getType2()); - writeH(temp.getItem().getType1()); - writeD(temp.getObjectId()); - writeD(temp.getItemId()); - writeD(temp.getCount()); - writeH(temp.getItem().getType2()); + writeH(item.getItem().getType1()); + writeD(item.getObjectId()); + writeD(item.getItemId()); + writeD(item.getCount()); + writeH(item.getItem().getType2()); writeH(255); - if (temp.isEquipped()) + if (item.isEquipped()) { writeH(1); } @@ -55,8 +56,8 @@ public class PetItemList extends ServerBasePacket { writeH(0); } - writeD(temp.getItem().getBodyPart()); - writeH(temp.getEnchantLevel()); + writeD(item.getItem().getBodyPart()); + writeH(item.getEnchantLevel()); writeH(0); } return getBytes(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java index 2eee3bbfb8..48d77aebef 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java @@ -51,9 +51,8 @@ public class PledgeShowMemberListAll extends ServerBasePacket writeD(0); writeS(""); writeD(0); - ClanMember[] members = _clan.getMembers(); - writeD(members.length - 1); - for (ClanMember member : members) + writeD(_clan.getMembers().size() - 1); + for (ClanMember member : _clan.getMembers()) { if (member.getName().equals(_activeChar.getName())) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java index 26e3ba3eb1..df4a53045b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateBuyListBuy.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.network.serverpackets; import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.l2jmobius.gameserver.model.TradeItem; @@ -45,7 +46,7 @@ public class PrivateBuyListBuy extends ServerBasePacket writeD(_buyer.getObjectId()); writeD(_seller.getAdena()); List buyerslist = _buyer.getBuyList(); - ItemInstance[] sellerItems = _seller.getInventory().getItems(); + Collection sellerItems = _seller.getInventory().getItems(); ArrayList sellerslist = new ArrayList<>(); int count = buyerslist.size(); for (int i = 0; i < count; ++i) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java index dea998520c..0969c9ba4c 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListBuy.java @@ -41,13 +41,11 @@ public class PrivateSellListBuy extends ServerBasePacket writeC(208); writeD(_buyer.getObjectId()); writeD(_buyer.getAdena()); - ItemInstance[] inventory = _buyer.getInventory().getItems(); TradeList list = new TradeList(0); List buyList = _buyer.getBuyList(); int count = _buyer.getInventory().getSize(); - for (int i2 = 0; i2 < count; ++i2) + for (ItemInstance item : _buyer.getInventory().getItems()) { - ItemInstance item = inventory[i2]; if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1)) || item.isEquipped()) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java index 856f296580..1a8beccfb0 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/PrivateSellListSell.java @@ -43,13 +43,11 @@ public class PrivateSellListSell extends ServerBasePacket writeC(179); writeD(_seller.getObjectId()); writeD(_seller.getAdena()); - ItemInstance[] inventory = _seller.getInventory().getItems(); TradeList list = new TradeList(0); List sellList = _seller.getSellList(); int count = _seller.getInventory().getSize(); - for (i = 0; i < count; ++i) + for (ItemInstance item : _seller.getInventory().getItems()) { - ItemInstance item = inventory[i]; if (item.isEquipped() || (item.getItem().getType2() == 3) || ((item.getItem().getType2() == 4) && (item.getItem().getType1() == 4)) || ((item.getItem().getType2() == 1) && (item.getItem().getType1() == 1)) || item.isEquipped()) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java index 5bbec0c8fe..0172e46ee6 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/SellList.java @@ -39,28 +39,22 @@ public class SellList extends ServerBasePacket @Override public byte[] getContent() { - ItemInstance item; - int i; writeC(28); writeD(_money); writeD(0); - ItemInstance[] inventory = _char.getInventory().getItems(); int count = _char.getInventory().getSize(); - for (i = 0; i < count; ++i) + for (ItemInstance item : _char.getInventory().getItems()) { - item = inventory[i]; if (item.isEquipped() || (item.getItemId() == 57) || (item.getItem().getType2() == 3)) { continue; } _selllist.add(item); - // _log.fine("item added to selllist: " + item.getItem().getName()); } count = _selllist.size(); writeH(count); - for (i = 0; i < count; ++i) + for (ItemInstance item : _selllist) { - item = _selllist.get(i); writeH(item.getItem().getType1()); writeD(item.getObjectId()); writeD(item.getItemId()); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java index 79b0014bf1..4caa2d49bb 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/TradeStart.java @@ -39,11 +39,9 @@ public class TradeStart extends ServerBasePacket { writeC(46); writeD(_me.getTransactionRequester().getObjectId()); - ItemInstance[] inventory = _me.getInventory().getItems(); int count = _me.getInventory().getSize(); - for (int i = 0; i < count; ++i) + for (ItemInstance item : _me.getInventory().getItems()) { - ItemInstance item = inventory[i]; if (item.isEquipped() || (item.getItem().getType2() == 3)) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java index d395fab3e2..84e86ed2db 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/serverpackets/WareHouseDepositList.java @@ -44,11 +44,9 @@ public class WareHouseDepositList extends ServerBasePacket writeC(83); writeD(_money); List itemlist = new ArrayList<>(); - ItemInstance[] inventory = _cha.getInventory().getItems(); int count = _cha.getInventory().getSize(); - for (i = 0; i < count; ++i) + for (ItemInstance item : _cha.getInventory().getItems()) { - ItemInstance item = inventory[i]; if (item.isEquipped() || (item.getItem().getType2() == 3)) { continue; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/CharTemplate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/CharTemplate.java index 9734459438..a05fc4edb4 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/CharTemplate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/templates/CharTemplate.java @@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.templates; import java.util.ArrayList; +import java.util.Collection; import java.util.List; public class CharTemplate @@ -393,9 +394,9 @@ public class CharTemplate _items.add(itemId); } - public Integer[] getItems() + public Collection getItems() { - return _items.toArray(new Integer[_items.size()]); + return _items; } public void setCanCraft(int b)
Name:
Lvl:Id:
" + skill.getName() + "" + skill.getLevel() + "" + skill.getId() + "
" + name + "