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

Removal of various conversions to arrays.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-04-22 01:53:19 +00:00
parent 6d16bebe1a
commit 6a3556614a
881 changed files with 3876 additions and 3980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/RecipeController.java
View File

@@ -17,7 +17,6 @@
package org.l2jmobius.gameserver;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -93,9 +92,7 @@ public class RecipeController
return;
}
final List<RecipeList> dwarfRecipes = Arrays.asList(manufacturer.getDwarvenRecipeBook());
final List<RecipeList> commonRecipes = Arrays.asList(manufacturer.getCommonRecipeBook());
if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList))
if (!manufacturer.getDwarvenRecipeBook().contains(recipeList) && !manufacturer.getCommonRecipeBook().contains(recipeList))
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH);
return;
@@ -131,9 +128,7 @@ public class RecipeController
return;
}
final List<RecipeList> dwarfRecipes = Arrays.asList(player.getDwarvenRecipeBook());
final List<RecipeList> commonRecipes = Arrays.asList(player.getCommonRecipeBook());
if (!dwarfRecipes.contains(recipeList) && !commonRecipes.contains(recipeList))
if (!player.getDwarvenRecipeBook().contains(recipeList) && !player.getCommonRecipeBook().contains(recipeList))
{
Util.handleIllegalPlayerAction(player, "Warning!! Character " + player.getName() + " of account " + player.getAccountName() + " sent a false recipe id.", Config.DEFAULT_PUNISH);
return;

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/ClanBBSManager.java
View File

@@ -276,8 +276,8 @@ public class ClanBBSManager extends BaseBBSManager
StringUtil.append(sb, "<td><button action=\"_bbsclan;clan;", index - 1, "\" back=\"l2ui_ch3.prev1_down\" fore=\"l2ui_ch3.prev1\" width=16 height=16 ></td>");
}
int nbp = ClanTable.getInstance().getClans().length / 8;
if ((nbp * 8) != ClanTable.getInstance().getClans().length)
int nbp = ClanTable.getInstance().getClans().size() / 8;
if ((nbp * 8) != ClanTable.getInstance().getClans().size())
{
nbp++;
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/communitybbs/Manager/TopicBBSManager.java
View File

@@ -293,7 +293,7 @@ public class TopicBBSManager extends BaseBBSManager
int nbp;
nbp = forum.getTopicSize() / 8;
if ((nbp * 8) != ClanTable.getInstance().getClans().length)
if ((nbp * 8) != ClanTable.getInstance().getClans().size())
{
nbp++;
}

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/MobGroupTable.java
View File

@@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.data;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -64,9 +65,9 @@ public class MobGroupTable
return null;
}
public MobGroup[] getGroups()
public Collection<MobGroup> getGroups()
{
return _groupMap.values().toArray(new MobGroup[_groupMap.size()]);
return _groupMap.values();
}
public boolean removeGroup(int groupKey)

7
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/ClanTable.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.sql;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Logger;
@@ -109,9 +110,9 @@ public class ClanTable
restoreClanWars();
}
public Clan[] getClans()
public Collection<Clan> getClans()
{
return _clans.values().toArray(new Clan[_clans.size()]);
return _clans.values();
}
public int getTopRate(int clanId)
@@ -498,7 +499,7 @@ public class ClanTable
}
}
if (count == (clan1.getMembers().length - 1))
if (count == (clan1.getMembers().size() - 1))
{
clan1.deleteEnemyClan(clan2);
clan2.deleteEnemyClan(clan1);

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/NpcTable.java
View File

@@ -650,7 +650,7 @@ public class NpcTable
return null;
}
public NpcTemplate[] getAllOfLevel(int level)
public List<NpcTemplate> getAllOfLevel(int level)
{
final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values())
@@ -660,10 +660,10 @@ public class NpcTable
list.add(t);
}
}
return list.toArray(new NpcTemplate[list.size()]);
return list;
}
public NpcTemplate[] getAllMonstersOfLevel(int level)
public List<NpcTemplate> getAllMonstersOfLevel(int level)
{
final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values())
@@ -673,10 +673,10 @@ public class NpcTable
list.add(t);
}
}
return list.toArray(new NpcTemplate[list.size()]);
return list;
}
public NpcTemplate[] getAllNpcStartingWith(String letter)
public List<NpcTemplate> getAllNpcStartingWith(String letter)
{
final List<NpcTemplate> list = new ArrayList<>();
for (NpcTemplate t : _npcs.values())
@@ -686,7 +686,7 @@ public class NpcTable
list.add(t);
}
}
return list.toArray(new NpcTemplate[list.size()]);
return list;
}
/**

47
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/sql/SkillTreeTable.java
View File

@@ -21,6 +21,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.List;
@@ -287,10 +288,9 @@ public class SkillTreeTable
return 0;
}
public SkillLearn[] getAvailableSkills(PlayerInstance player, ClassId classId)
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId)
{
final List<SkillLearn> result = getAvailableSkills(player, classId, player);
return result.toArray(new SkillLearn[result.size()]);
return getAvailableSkills(player, classId, player);
}
/**
@@ -331,7 +331,7 @@ public class SkillTreeTable
return result;
}
public SkillLearn[] getAvailableSkills(PlayerInstance player)
public List<SkillLearn> getAvailableSkills(PlayerInstance player)
{
final List<SkillLearn> result = new ArrayList<>();
final List<SkillLearn> skills = new ArrayList<>();
@@ -368,22 +368,21 @@ public class SkillTreeTable
}
}
}
return result.toArray(new SkillLearn[result.size()]);
return result;
}
public EnchantSkillLearn[] getAvailableEnchantSkills(PlayerInstance player)
public List<EnchantSkillLearn> getAvailableEnchantSkills(PlayerInstance player)
{
if (player.getLevel() < 76)
{
return Collections.emptyList();
}
final List<EnchantSkillLearn> result = new ArrayList<>();
final List<EnchantSkillLearn> skills = new ArrayList<>();
skills.addAll(_enchantSkillTrees);
final Skill[] oldSkills = player.getAllSkills().toArray(new Skill[0]);
if (player.getLevel() < 76)
{
return result.toArray(new EnchantSkillLearn[result.size()]);
}
final Collection<Skill> oldSkills = player.getAllSkills();
for (EnchantSkillLearn skillLearn : skills)
{
boolean isKnownSkill = false;
@@ -404,20 +403,20 @@ public class SkillTreeTable
}
}
}
return result.toArray(new EnchantSkillLearn[result.size()]);
return result;
}
public PledgeSkillLearn[] getAvailablePledgeSkills(PlayerInstance player)
public List<PledgeSkillLearn> getAvailablePledgeSkills(PlayerInstance player)
{
final List<PledgeSkillLearn> result = new ArrayList<>();
final List<PledgeSkillLearn> skills = _pledgeSkillTrees;
if (skills == null)
{
LOGGER.warning("No clan skills defined!");
return new PledgeSkillLearn[0];
return Collections.emptyList();
}
final Skill[] oldSkills = player.getClan().getAllSkills();
final Skill[] oldSkills = player.getClan().getAllSkills().toArray(new Skill[0]);
for (PledgeSkillLearn temp : skills)
{
if (temp.getBaseLevel() <= player.getClan().getLevel())
@@ -443,8 +442,7 @@ public class SkillTreeTable
}
}
}
return result.toArray(new PledgeSkillLearn[result.size()]);
return result;
}
/**
@@ -533,8 +531,7 @@ public class SkillTreeTable
public int getSkillSpCost(PlayerInstance player, Skill skill)
{
int skillCost = 100000000;
final EnchantSkillLearn[] enchantSkillLearnList = getAvailableEnchantSkills(player);
for (EnchantSkillLearn enchantSkillLearn : enchantSkillLearnList)
for (EnchantSkillLearn enchantSkillLearn : getAvailableEnchantSkills(player))
{
if (enchantSkillLearn.getId() != skill.getId())
{
@@ -559,8 +556,7 @@ public class SkillTreeTable
public int getSkillExpCost(PlayerInstance player, Skill skill)
{
int skillCost = 100000000;
final EnchantSkillLearn[] enchantSkillLearnList = getAvailableEnchantSkills(player);
for (EnchantSkillLearn enchantSkillLearn : enchantSkillLearnList)
for (EnchantSkillLearn enchantSkillLearn : getAvailableEnchantSkills(player))
{
if (enchantSkillLearn.getId() != skill.getId())
{
@@ -579,14 +575,12 @@ public class SkillTreeTable
skillCost = enchantSkillLearn.getExp();
}
return skillCost;
}
public byte getSkillRate(PlayerInstance player, Skill skill)
{
final EnchantSkillLearn[] enchantSkillLearnList = getAvailableEnchantSkills(player);
for (EnchantSkillLearn enchantSkillLearn : enchantSkillLearnList)
for (EnchantSkillLearn enchantSkillLearn : getAvailableEnchantSkills(player))
{
if (enchantSkillLearn.getId() != skill.getId())
{
@@ -600,7 +594,6 @@ public class SkillTreeTable
return enchantSkillLearn.getRate(player);
}
return 0;
}

17
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/AutoChatHandler.java
View File

@@ -266,10 +266,9 @@ public class AutoChatHandler implements SpawnListener
return _chatDefinitions.get(objectId);
}
protected AutoChatDefinition[] getChatDefinitions()
protected Collection<AutoChatDefinition> getChatDefinitions()
{
final Collection<AutoChatDefinition> values = _chatDefinitions.values();
return values.toArray(new AutoChatDefinition[values.size()]);
return _chatDefinitions.values();
}
/**
@@ -389,14 +388,14 @@ public class AutoChatHandler implements SpawnListener
* Returns a list of all NPC instances handled by this auto chat instance.
* @return NpcInstance[] npcInsts
*/
public NpcInstance[] getNPCInstanceList()
public List<NpcInstance> getNPCInstanceList()
{
final List<NpcInstance> npcInsts = new ArrayList<>();
for (AutoChatDefinition chatDefinition : _chatDefinitions.values())
{
npcInsts.add(chatDefinition._npcInstance);
}
return npcInsts.toArray(new NpcInstance[npcInsts.size()]);
return npcInsts;
}
/**
@@ -630,7 +629,7 @@ public class AutoChatHandler implements SpawnListener
public synchronized void run()
{
final AutoChatInstance chatInst = _registeredChats.get(_runnerNpcId);
AutoChatDefinition[] chatDefinitions;
Collection<AutoChatDefinition> chatDefinitions;
if (chatInst.isGlobal())
{
chatDefinitions = chatInst.getChatDefinitions();
@@ -644,10 +643,8 @@ public class AutoChatHandler implements SpawnListener
return;
}
chatDefinitions = new AutoChatDefinition[]
{
chatDef
};
chatDefinitions = new ArrayList<>();
chatDefinitions.add(chatDef);
}
for (AutoChatDefinition chatDef : chatDefinitions)

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminFightCalculator.java
View File

@@ -143,8 +143,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
replyMSG.append("<html><title>Select first mob to fight</title>");
replyMSG.append("<body><table>");
final NpcTemplate[] npcs = NpcTable.getInstance().getAllOfLevel(lvl1);
for (NpcTemplate n : npcs)
for (NpcTemplate n : NpcTable.getInstance().getAllOfLevel(lvl1))
{
replyMSG.append("<tr><td><a action=\"bypass -h admin_fight_calculator lvl1 " + lvl1 + " lvl2 " + lvl2 + " mid1 " + n.getNpcId() + " mid2 " + mid2 + "\">" + n.getName() + "</a></td></tr>");
}
@@ -156,8 +155,7 @@ public class AdminFightCalculator implements IAdminCommandHandler
replyMSG.append("<html><title>Select second mob to fight</title>");
replyMSG.append("<body><table>");
final NpcTemplate[] npcs = NpcTable.getInstance().getAllOfLevel(lvl2);
for (NpcTemplate n : npcs)
for (NpcTemplate n : NpcTable.getInstance().getAllOfLevel(lvl2))
{
replyMSG.append("<tr><td><a action=\"bypass -h admin_fight_calculator lvl1 " + lvl1 + " lvl2 " + lvl2 + " mid1 " + mid1 + " mid2 " + n.getNpcId() + "\">" + n.getName() + "</a></td></tr>");
}

21
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMammon.java
View File

@@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -77,12 +78,12 @@ public class AdminMammon implements IAdminCommandHandler
if (blackSpawnInst != null)
{
final NpcInstance[] blackInst = blackSpawnInst.getNPCInstanceList();
if (blackInst.length > 0)
final List<NpcInstance> blackInst = blackSpawnInst.getNPCInstanceList();
if (!blackInst.isEmpty())
{
final int x1 = blackInst[0].getX();
final int y1 = blackInst[0].getY();
final int z1 = blackInst[0].getZ();
final int x1 = blackInst.get(0).getX();
final int y1 = blackInst.get(0).getY();
final int z1 = blackInst.get(0).getZ();
BuilderUtil.sendSysMessage(activeChar, "Blacksmith of Mammon: " + x1 + " " + y1 + " " + z1);
if (teleportIndex == 1)
{
@@ -97,12 +98,12 @@ public class AdminMammon implements IAdminCommandHandler
if (merchSpawnInst != null)
{
final NpcInstance[] merchInst = merchSpawnInst.getNPCInstanceList();
if (merchInst.length > 0)
final List<NpcInstance> merchInst = merchSpawnInst.getNPCInstanceList();
if (!merchInst.isEmpty())
{
final int x2 = merchInst[0].getX();
final int y2 = merchInst[0].getY();
final int z2 = merchInst[0].getZ();
final int x2 = merchInst.get(0).getX();
final int y2 = merchInst.get(0).getY();
final int z2 = merchInst.get(0).getZ();
BuilderUtil.sendSysMessage(activeChar, "Merchant of Mammon: " + x2 + " " + y2 + " " + z2);
if (teleportIndex == 2)
{

9
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMassRecall.java
View File

@@ -53,8 +53,7 @@ public class AdminMassRecall implements IAdminCommandHandler
return true;
}
final PlayerInstance[] m = clan.getOnlineMembers();
for (PlayerInstance element : m)
for (PlayerInstance element : clan.getOnlineMembers())
{
Teleport(element, activeChar.getX(), activeChar.getY(), activeChar.getZ(), "Admin is teleporting you");
}
@@ -79,8 +78,7 @@ public class AdminMassRecall implements IAdminCommandHandler
final int ally = clan.getAllyId();
if (ally == 0)
{
final PlayerInstance[] m = clan.getOnlineMembers();
for (PlayerInstance element : m)
for (PlayerInstance element : clan.getOnlineMembers())
{
Teleport(element, activeChar.getX(), activeChar.getY(), activeChar.getZ(), "Admin is teleporting you");
}
@@ -91,8 +89,7 @@ public class AdminMassRecall implements IAdminCommandHandler
{
if (aclan.getAllyId() == ally)
{
final PlayerInstance[] m = aclan.getOnlineMembers();
for (PlayerInstance element : m)
for (PlayerInstance element : aclan.getOnlineMembers())
{
Teleport(element, activeChar.getX(), activeChar.getY(), activeChar.getZ(), "Admin is teleporting you");
}

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMenu.java
View File

@@ -145,8 +145,7 @@ public class AdminMenu implements IAdminCommandHandler
return true;
}
final PlayerInstance[] members = clan.getOnlineMembers();
for (PlayerInstance member : members)
for (PlayerInstance member : clan.getOnlineMembers())
{
teleportCharacter(member, x, y, z, activeChar, "Your clan is being teleported by an Admin.");
}

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminMobGroup.java
View File

@@ -621,13 +621,11 @@ public class AdminMobGroup implements IAdminCommandHandler
private void showGroupList(PlayerInstance activeChar)
{
final MobGroup[] mobGroupList = MobGroupTable.getInstance().getGroups();
BuilderUtil.sendSysMessage(activeChar, "======= <Mob Groups> =======");
for (MobGroup mobGroup : mobGroupList)
for (MobGroup mobGroup : MobGroupTable.getInstance().getGroups())
{
activeChar.sendMessage(mobGroup.getGroupId() + ": " + mobGroup.getActiveMobCount() + " alive out of " + mobGroup.getMaxMobCount() + " of NPC ID " + mobGroup.getTemplate().getNpcId() + " (" + mobGroup.getStatus() + ")");
}
activeChar.sendPacket(SystemMessageId.EMPTY_3);
}

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
View File

@@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.List;
import java.util.StringTokenizer;
import org.l2jmobius.gameserver.data.SkillTable;
@@ -191,9 +192,9 @@ public class AdminSkill implements IAdminCommandHandler
boolean countUnlearnable = true;
int unLearnable = 0;
int skillCounter = 0;
SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player, player.getClassId());
List<SkillLearn> skills = SkillTreeTable.getInstance().getAvailableSkills(player, player.getClassId());
while (skills.length > unLearnable)
while (skills.size() > unLearnable)
{
for (SkillLearn s : skills)
{

17
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSpawn.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.handler.admincommandhandlers;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.NoSuchElementException;
@@ -336,18 +337,18 @@ public class AdminSpawn implements IAdminCommandHandler
private void showMonsters(PlayerInstance activeChar, int level, int from)
{
final StringBuilder tb = new StringBuilder();
final NpcTemplate[] mobs = NpcTable.getInstance().getAllMonstersOfLevel(level);
final List<NpcTemplate> mobs = NpcTable.getInstance().getAllMonstersOfLevel(level);
// Start
tb.append("<html><title>Spawn Monster:</title><body><p> Level " + level + ":<br>Total NPCs : " + mobs.length + "<br>");
tb.append("<html><title>Spawn Monster:</title><body><p> Level " + level + ":<br>Total NPCs : " + mobs.size() + "<br>");
String end1 = "<br><center><button value=\"Next\" action=\"bypass -h admin_spawn_index " + level + " $from$\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>";
final String end2 = "<br><center><button value=\"Back\" action=\"bypass -h admin_show_spawns\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>";
// Loop
boolean ended = true;
for (int i = from; i < mobs.length; i++)
for (int i = from; i < mobs.size(); i++)
{
final String txt = "<a action=\"bypass -h admin_spawn_monster " + mobs[i].getNpcId() + "\">" + mobs[i].getName() + "</a><br1>";
final String txt = "<a action=\"bypass -h admin_spawn_monster " + mobs.get(i).getNpcId() + "\">" + mobs.get(i).getName() + "</a><br1>";
if ((tb.length() + txt.length() + end2.length()) > 8192)
{
end1 = end1.replace("$from$", "" + i);
@@ -374,18 +375,18 @@ public class AdminSpawn implements IAdminCommandHandler
private void showNpcs(PlayerInstance activeChar, String starting, int from)
{
final StringBuilder tb = new StringBuilder();
final NpcTemplate[] mobs = NpcTable.getInstance().getAllNpcStartingWith(starting);
final List<NpcTemplate> mobs = NpcTable.getInstance().getAllNpcStartingWith(starting);
// Start
tb.append("<html><title>Spawn Monster:</title><body><p> There are " + mobs.length + " Npcs whose name starts with " + starting + ":<br>");
tb.append("<html><title>Spawn Monster:</title><body><p> There are " + mobs.size() + " Npcs whose name starts with " + starting + ":<br>");
String end1 = "<br><center><button value=\"Next\" action=\"bypass -h admin_npc_index " + starting + " $from$\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>";
final String end2 = "<br><center><button value=\"Back\" action=\"bypass -h admin_show_npcs\" width=40 height=15 back=\"sek.cbui94\" fore=\"sek.cbui92\"></center></body></html>";
// Loop
boolean ended = true;
for (int i = from; i < mobs.length; i++)
for (int i = from; i < mobs.size(); i++)
{
final String txt = "<a action=\"bypass -h admin_spawn_monster " + mobs[i].getNpcId() + "\">" + mobs[i].getName() + "</a><br1>";
final String txt = "<a action=\"bypass -h admin_spawn_monster " + mobs.get(i).getNpcId() + "\">" + mobs.get(i).getName() + "</a><br1>";
if ((tb.length() + txt.length() + end2.length()) > 8192)
{
end1 = end1.replace("$from$", "" + i);

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Recipes.java
View File

@@ -59,7 +59,7 @@ public class Recipes implements IItemHandler
// Cannot add recipe, because create item level too low.
player.sendPacket(new SystemMessage(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE));
}
else if (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit())
else if (player.getDwarvenRecipeBook().size() >= player.getDwarfRecipeLimit())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_BE_REGISTERED);
sm.addNumber(player.getDwarfRecipeLimit());
@@ -87,7 +87,7 @@ public class Recipes implements IItemHandler
// Cannot add recipe, because create item level too low.
player.sendPacket(new SystemMessage(SystemMessageId.YOUR_CREATE_ITEM_LEVEL_IS_TOO_LOW_TO_REGISTER_THIS_RECIPE));
}
else if (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit())
else if (player.getCommonRecipeBook().size() >= player.getCommonRecipeLimit())
{
final SystemMessage sm = new SystemMessage(SystemMessageId.UP_TO_S1_RECIPES_CAN_BE_REGISTERED);
sm.addNumber(player.getCommonRecipeLimit());

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Harvest.java
View File

@@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Attackable.RewardItem;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.MonsterInstance;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -89,8 +90,8 @@ public class Harvest implements ISkillHandler
{
if (calcSuccess())
{
final Attackable.RewardItem[] items = _target.takeHarvest();
if ((items != null) && (items.length > 0))
final List<RewardItem> items = _target.takeHarvest();
if ((items != null) && !items.isEmpty())
{
for (Attackable.RewardItem ritem : items)
{

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Sweep.java
View File

@@ -24,6 +24,7 @@ import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.Skill.SkillType;
import org.l2jmobius.gameserver.model.WorldObject;
import org.l2jmobius.gameserver.model.actor.Attackable;
import org.l2jmobius.gameserver.model.actor.Attackable.RewardItem;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
@@ -61,7 +62,7 @@ public class Sweep implements ISkillHandler
}
final Attackable target = (Attackable) target1;
Attackable.RewardItem[] items = null;
List<RewardItem> items = null;
boolean isSweeping = false;
synchronized (target)
{
@@ -74,7 +75,7 @@ public class Sweep implements ISkillHandler
if (isSweeping)
{
if ((items == null) || (items.length == 0))
if ((items == null) || items.isEmpty())
{
continue;
}

20
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/MacroList.java
View File

@@ -20,6 +20,7 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -55,9 +56,9 @@ public class MacroList
return _revision;
}
public Macro[] getAllMacroses()
public Collection<Macro> getAllMacroses()
{
return _macroses.values().toArray(new Macro[_macroses.size()]);
return _macroses.values();
}
public Macro getMacro(int id)
@@ -103,8 +104,7 @@ public class MacroList
_macroses.remove(id);
final ShortCut[] allShortCuts = _owner.getAllShortCuts();
for (ShortCut sc : allShortCuts)
for (ShortCut sc : _owner.getAllShortCuts())
{
if ((sc.getId() == id) && (sc.getType() == ShortCut.TYPE_MACRO))
{
@@ -119,16 +119,16 @@ public class MacroList
{
_revision++;
final Macro[] all = getAllMacroses();
if (all.length == 0)
final Collection<Macro> allMacros = getAllMacroses();
if (allMacros.isEmpty())
{
_owner.sendPacket(new SendMacroList(_revision, all.length, null));
_owner.sendPacket(new SendMacroList(_revision, allMacros.size(), null));
}
else
{
for (Macro m : all)
for (Macro macro : allMacros)
{
_owner.sendPacket(new SendMacroList(_revision, all.length, m));
_owner.sendPacket(new SendMacroList(_revision, allMacros.size(), macro));
}
}
}
@@ -240,7 +240,7 @@ public class MacroList
commands.add(mcmd);
}
final Macro m = new Macro(id, icon, name, descr, acronym, commands.toArray(new MacroCmd[commands.size()]));
final Macro m = new Macro(id, icon, name, descr, acronym, commands. toArray(new MacroCmd[commands.size()]));
_macroses.put(m.id, m);
}
rset.close();

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ShortCuts.java
View File

@@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.model;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.Collection;
import java.util.Map;
import java.util.TreeMap;
import java.util.logging.Logger;
@@ -45,9 +46,9 @@ public class ShortCuts
_owner = owner;
}
public ShortCut[] getAllShortCuts()
public Collection<ShortCut> getAllShortCuts()
{
return _shortCuts.values().toArray(new ShortCut[_shortCuts.values().size()]);
return _shortCuts.values();
}
public ShortCut getShortCut(int slot, int page)

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/TradeList.java
View File

@@ -198,9 +198,9 @@ public class TradeList
* Retrieves items from TradeList
* @return
*/
public TradeItem[] getItems()
public List<TradeItem> getItems()
{
return _items.toArray(new TradeItem[_items.size()]);
return _items;
}
/**
@@ -208,7 +208,7 @@ public class TradeList
* @param inventory
* @return ItemInstance : items in inventory
*/
public TradeItem[] getAvailableItems(PlayerInventory inventory)
public List<TradeItem> getAvailableItems(PlayerInventory inventory)
{
final List<TradeItem> list = new ArrayList<>();
for (TradeItem item : _items)
@@ -216,7 +216,7 @@ public class TradeList
item = new TradeItem(item, item.getCount(), item.getPrice());
list.add(inventory.adjustAvailableItem(item, list));
}
return list.toArray(new TradeItem[list.size()]);
return list;
}
/**

18
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -302,10 +302,10 @@ public class Attackable extends NpcInstance
}
/** Table containing all Items that a Dwarf can Sweep on this Attackable */
private RewardItem[] _sweepItems;
private List<RewardItem> _sweepItems;
/** crops */
private RewardItem[] _harvestItems;
private List<RewardItem> _harvestItems;
private boolean _seeded;
private int _seedType = 0;
private PlayerInstance _seeder = null;
@@ -1781,7 +1781,7 @@ public class Attackable extends NpcInstance
if (cat.isSweep())
{
// according to sh1ny, seeded mobs CAN be spoiled and swept.
if (isSpoil()/* && !_seeded */)
if (isSpoil() /* && !_seeded */)
{
final List<RewardItem> sweepList = new ArrayList<>();
for (DropData drop : cat.getAllDrops())
@@ -1798,7 +1798,7 @@ public class Attackable extends NpcInstance
// Set the table _sweepItems of this Attackable
if (!sweepList.isEmpty())
{
_sweepItems = sweepList.toArray(new RewardItem[sweepList.size()]);
_sweepItems = sweepList;
}
}
}
@@ -2046,9 +2046,9 @@ public class Attackable extends NpcInstance
* Return table containing all ItemInstance that can be spoiled.<br>
* @return
*/
public synchronized RewardItem[] takeSweep()
public synchronized List<RewardItem> takeSweep()
{
final RewardItem[] sweep = _sweepItems;
final List<RewardItem> sweep = _sweepItems;
_sweepItems = null;
return sweep;
}
@@ -2057,9 +2057,9 @@ public class Attackable extends NpcInstance
* Return table containing all ItemInstance that can be harvested.<br>
* @return
*/
public synchronized RewardItem[] takeHarvest()
public synchronized List<RewardItem> takeHarvest()
{
final RewardItem[] harvest = _harvestItems;
final List<RewardItem> harvest = _harvestItems;
_harvestItems = null;
return harvest;
}
@@ -2708,7 +2708,7 @@ public class Attackable extends NpcInstance
final List<RewardItem> harvested = new ArrayList<>();
harvested.add(new RewardItem(ManorSeedData.getInstance().getCropType(_seedType), (int) (count * Config.RATE_DROP_MANOR)));
_harvestItems = harvested.toArray(new RewardItem[harvested.size()]);
_harvestItems = harvested;
}
public void setSeeded(boolean seeded)

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
View File

@@ -116,10 +116,9 @@ public class FishermanInstance extends FolkInstance
public void showSkillList(PlayerInstance player)
{
final SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player);
final AquireSkillList asl = new AquireSkillList(AquireSkillList.skillType.Fishing);
int counts = 0;
for (SkillLearn s : skills)
for (SkillLearn s : SkillTreeTable.getInstance().getAvailableSkills(player))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if (sk == null)

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java
View File

@@ -96,10 +96,9 @@ public class FolkInstance extends NpcInstance
return;
}
final SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player, classId);
final AquireSkillList asl = new AquireSkillList(AquireSkillList.skillType.Usual);
int counts = 0;
for (SkillLearn s : skills)
for (SkillLearn s : SkillTreeTable.getInstance().getAvailableSkills(player, classId))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || !sk.getCanLearn(player.getClassId()) || !sk.canTeachBy(npcId))
@@ -184,10 +183,9 @@ public class FolkInstance extends NpcInstance
return;
}
final EnchantSkillLearn[] skills = SkillTreeTable.getInstance().getAvailableEnchantSkills(player);
final ExEnchantSkillList esl = new ExEnchantSkillList();
int counts = 0;
for (EnchantSkillLearn s : skills)
for (EnchantSkillLearn s : SkillTreeTable.getInstance().getAvailableEnchantSkills(player))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if (sk == null)
@@ -273,7 +271,7 @@ public class FolkInstance extends NpcInstance
continue;
}
if (SkillTreeTable.getInstance().getAvailableSkills(player, cid).length == 0)
if (SkillTreeTable.getInstance().getAvailableSkills(player, cid).isEmpty())
{
continue;
}

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
View File

@@ -1472,9 +1472,9 @@ public class NpcInstance extends Creature
* <b><u>Actions</u>:</b><br>
* <li>Send a Server->Client NpcHtmlMessage containing the text of the NpcInstance to the PlayerInstance</li><br>
* @param player The PlayerInstance that talk with the NpcInstance
* @param quests The table containing quests of the NpcInstance
* @param quests The list containing quests of the NpcInstance
*/
private void showQuestChooseWindow(PlayerInstance player, Quest[] quests)
private void showQuestChooseWindow(PlayerInstance player, List<Quest> quests)
{
final StringBuilder sb = new StringBuilder();
sb.append("<html><body><title>Talk about:</title><br>");
@@ -1627,7 +1627,7 @@ public class NpcInstance extends Creature
// Display a QuestChooseWindow (if several quests are available) or QuestWindow
if (options.size() > 1)
{
showQuestChooseWindow(player, options.toArray(new Quest[options.size()]));
showQuestChooseWindow(player, options);
}
else if (options.size() == 1)
{

40
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -1217,18 +1217,18 @@ public class PlayerInstance extends Playable
* Return a table containing all Common RecipeList of the PlayerInstance.
* @return the common recipe book
*/
public RecipeList[] getCommonRecipeBook()
public Collection<RecipeList> getCommonRecipeBook()
{
return _commonRecipeBook.values().toArray(new RecipeList[_commonRecipeBook.values().size()]);
return _commonRecipeBook.values();
}
/**
* Return a table containing all Dwarf RecipeList of the PlayerInstance.
* @return the dwarven recipe book
*/
public RecipeList[] getDwarvenRecipeBook()
public Collection<RecipeList> getDwarvenRecipeBook()
{
return _dwarvenRecipeBook.values().toArray(new RecipeList[_dwarvenRecipeBook.values().size()]);
return _dwarvenRecipeBook.values();
}
/**
@@ -1538,7 +1538,7 @@ public class PlayerInstance extends Playable
* Return a table containing all ShortCut of the PlayerInstance.
* @return the all short cuts
*/
public ShortCut[] getAllShortCuts()
public Collection<ShortCut> getAllShortCuts()
{
return _shortCuts.getAllShortCuts();
}
@@ -2820,8 +2820,7 @@ public class PlayerInstance extends Playable
// Add clan skills
if ((getClan() != null) && (getClan().getReputationScore() >= 0))
{
final Skill[] skills = getClan().getAllSkills();
for (Skill sk : skills)
for (Skill sk : getClan().getAllSkills())
{
if (sk.getMinPledgeClass() <= getPledgeClass())
{
@@ -7387,9 +7386,9 @@ public class PlayerInstance extends Playable
return false;
}
final List<ItemInstance> unequiped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
final List<ItemInstance> unequipped = getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
final InventoryUpdate iu = new InventoryUpdate();
for (ItemInstance element : unequiped)
for (ItemInstance element : unequipped)
{
iu.addModifiedItem(element);
}
@@ -7399,20 +7398,20 @@ public class PlayerInstance extends Playable
broadcastUserInfo();
// this can be 0 if the user pressed the right mousebutton twice very fast
if (!unequiped.isEmpty())
if (!unequipped.isEmpty())
{
SystemMessage sm = null;
final ItemInstance unequipedItem = unequiped.get(0);
if (unequipedItem.getEnchantLevel() > 0)
final ItemInstance unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addNumber(unequipedItem.getEnchantLevel());
sm.addItemName(unequipedItem.getItemId());
sm.addNumber(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem.getItemId());
}
else
{
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_DISARMED);
sm.addItemName(unequipedItem.getItemId());
sm.addItemName(unequippedItem.getItemId());
}
sendPacket(sm);
}
@@ -7427,9 +7426,9 @@ public class PlayerInstance extends Playable
return false;
}
final List<ItemInstance> unequiped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart());
final List<ItemInstance> unequipped = getInventory().unEquipItemInBodySlotAndRecord(sld.getItem().getBodyPart());
final InventoryUpdate iu = new InventoryUpdate();
for (ItemInstance element : unequiped)
for (ItemInstance element : unequipped)
{
iu.addModifiedItem(element);
}
@@ -7439,10 +7438,10 @@ public class PlayerInstance extends Playable
broadcastUserInfo();
// this can be 0 if the user pressed the right mousebutton twice very fast
if (!unequiped.isEmpty())
if (!unequipped.isEmpty())
{
SystemMessage sm = null;
final ItemInstance item = unequiped.get(0);
final ItemInstance item = unequipped.get(0);
if (item.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
@@ -8838,8 +8837,7 @@ public class PlayerInstance extends Playable
LOGGER.warning("Error could not delete skill: " + e);
}
final ShortCut[] allShortCuts = getAllShortCuts();
for (ShortCut sc : allShortCuts)
for (ShortCut sc : getAllShortCuts())
{
if ((sc != null) && (skill != null) && (sc.getId() == skill.getId()) && (sc.getType() == ShortCut.TYPE_SKILL))
{

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SignsPriestInstance.java
View File

@@ -584,8 +584,7 @@ public class SignsPriestInstance extends FolkInstance
if (allyId != 0)
{
// Check if another clan in the same alliance owns a castle, by traversing the list of clans and act accordingly.
final Clan[] clanList = ClanTable.getInstance().getClans();
for (Clan clan : clanList)
for (Clan clan : ClanTable.getInstance().getClans())
{
if ((clan.getAllyId() == allyId) && (clan.getCastleId() > 0))
{

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/VillageMasterInstance.java
View File

@@ -1005,10 +1005,9 @@ public class VillageMasterInstance extends FolkInstance
return;
}
final PledgeSkillLearn[] skills = SkillTreeTable.getInstance().getAvailablePledgeSkills(player);
final AquireSkillList asl = new AquireSkillList(AquireSkillList.skillType.Clan);
int counts = 0;
for (PledgeSkillLearn s : skills)
for (PledgeSkillLearn s : SkillTreeTable.getInstance().getAvailablePledgeSkills(player))
{
final int cost = s.getRepCost();
counts++;

29
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@@ -21,6 +21,7 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -488,12 +489,12 @@ public class Clan
}
}
public ClanMember[] getMembers()
public Collection<ClanMember> getMembers()
{
return _members.values().toArray(new ClanMember[_members.size()]);
return _members.values();
}
public Integer[] getOfflineMembersIds()
public List<Integer> getOfflineMembersIds()
{
final List<Integer> list = new ArrayList<>();
for (ClanMember temp : _members.values())
@@ -503,7 +504,7 @@ public class Clan
list.add(temp.getObjectId());
}
}
return list.toArray(new Integer[list.size()]);
return list;
}
public int getMembersCount()
@@ -590,7 +591,7 @@ public class Clan
return limit;
}
public PlayerInstance[] getOnlineMembers()
public List<PlayerInstance> getOnlineMembers()
{
final List<PlayerInstance> result = new ArrayList<>();
for (ClanMember temp : _members.values())
@@ -607,7 +608,7 @@ public class Clan
LOGGER.warning(e.toString());
}
}
return result.toArray(new PlayerInstance[result.size()]);
return result;
}
public int getAllyId()
@@ -1009,9 +1010,9 @@ public class Clan
}
}
public Skill[] getAllSkills()
public Collection<Skill> getAllSkills()
{
return _skills.values().toArray(new Skill[_skills.values().size()]);
return _skills.values();
}
/**
@@ -1433,9 +1434,9 @@ public class Clan
* used to retrieve all subPledges
* @return
*/
public SubPledge[] getAllSubPledges()
public Collection<SubPledge> getAllSubPledges()
{
return _subPledges.values().toArray(new SubPledge[_subPledges.values().size()]);
return _subPledges.values();
}
public SubPledge createSubPledge(PlayerInstance player, int pledgeTypeValue, String leaderName, String subPledgeName)
@@ -1660,9 +1661,9 @@ public class Clan
}
}
public RankPrivs[] getAllRankPrivs()
public Collection<RankPrivs> getAllRankPrivs()
{
return _privs.values().toArray(new RankPrivs[_privs.values().size()]);
return _privs.values();
}
public int getLeaderSubPledge(String name)
@@ -1688,7 +1689,7 @@ public class Clan
if ((_reputationScore >= 0) && (value < 0))
{
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.SINCE_THE_CLAN_REPUTATION_SCORE_HAS_DROPPED_TO_0_OR_LOWER_YOUR_CLAN_SKILL_S_WILL_BE_DE_ACTIVATED));
final Skill[] skills = getAllSkills();
final Collection<Skill> skills = getAllSkills();
for (ClanMember member : _members.values())
{
if (member.isOnline() && (member.getPlayerInstance() != null))
@@ -1703,7 +1704,7 @@ public class Clan
else if ((_reputationScore < 0) && (value >= 0))
{
broadcastToOnlineMembers(new SystemMessage(SystemMessageId.CLAN_SKILLS_WILL_NOW_BE_ACTIVATED_SINCE_THE_CLAN_S_REPUTATION_SCORE_IS_0_OR_HIGHER));
final Skill[] skills = getAllSkills();
final Collection<Skill> skills = getAllSkills();
for (ClanMember member : _members.values())
{
if (member.isOnline() && (member.getPlayerInstance() != null))

7
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/ClanMember.java
View File

@@ -104,12 +104,11 @@ public class ClanMember
if (_clan.getReputationScore() >= 0)
{
final Skill[] skills = _clan.getAllSkills();
for (Skill sk : skills)
for (Skill skill : _clan.getAllSkills())
{
if (sk.getMinPledgeClass() <= player.getPledgeClass())
if (skill.getMinPledgeClass() <= player.getPledgeClass())
{
player.addSkill(sk, false);
player.addSkill(skill, false);
}
}
}

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -142,7 +142,7 @@ public abstract class Inventory extends ItemContainer
public static final class ChangeRecorder implements PaperdollListener
{
private final Inventory _inventory;
private final List<ItemInstance> _changed;
private final List<ItemInstance> _changed = new ArrayList<>(1);
/**
* Constructor of the ChangeRecorder
@@ -151,7 +151,6 @@ public abstract class Inventory extends ItemContainer
ChangeRecorder(Inventory inventory)
{
_inventory = inventory;
_changed = new ArrayList<>();
_inventory.addPaperdollListener(this);
}
@@ -1029,7 +1028,6 @@ public abstract class Inventory extends ItemContainer
public List<ItemInstance> unEquipItemInBodySlotAndRecord(int slot)
{
final ChangeRecorder recorder = newRecorder();
try
{
unEquipItemInBodySlot(slot);

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/partymatching/PartyMatchRoomList.java
View File

@@ -16,6 +16,7 @@
*/
package org.l2jmobius.gameserver.model.partymatching;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
@@ -65,9 +66,9 @@ public class PartyMatchRoomList
return _rooms.get(id);
}
public PartyMatchRoom[] getRooms()
public Collection<PartyMatchRoom> getRooms()
{
return _rooms.values().toArray(new PartyMatchRoom[_rooms.size()]);
return _rooms.values();
}
public int getPartyMatchRoomCount()

13
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/quest/Quest.java
View File

@@ -1815,7 +1815,7 @@ public class Quest extends ManagedScript
return null;
}
private void setQuestToOfflineMembers(Integer[] objectsId)
private void setQuestToOfflineMembers(List<Integer> objectsId)
{
try (Connection con = DatabaseFactory.getConnection())
{
@@ -1866,11 +1866,8 @@ public class Quest extends ManagedScript
{
if (player.isClanLeader())
{
final PlayerInstance[] onlineMembers = player.getClan().getOnlineMembers();
final Integer[] offlineMembersIds = player.getClan().getOfflineMembersIds();
// Setting it for online members...
for (PlayerInstance onlineMember : onlineMembers)
for (PlayerInstance onlineMember : player.getClan().getOnlineMembers())
{
if (!onlineMember.isClanLeader())
{
@@ -1879,7 +1876,7 @@ public class Quest extends ManagedScript
}
// Setting it for offline members...
setQuestToOfflineMembers(offlineMembersIds);
setQuestToOfflineMembers(player.getClan().getOfflineMembersIds());
}
}
@@ -1891,10 +1888,8 @@ public class Quest extends ManagedScript
{
if (player.isClanLeader())
{
final PlayerInstance[] onlineMembers = player.getClan().getOnlineMembers();
// Deleting it for online members...
for (PlayerInstance onlineMember : onlineMembers)
for (PlayerInstance onlineMember : player.getClan().getOnlineMembers())
{
if (!onlineMember.isClanLeader())
{

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/siege/Siege.java
View File

@@ -484,8 +484,7 @@ public class Siege
// The player's clan is in an alliance
if (allyId != 0)
{
final Clan[] clanList = ClanTable.getInstance().getClans();
for (Clan clan : clanList)
for (Clan clan : ClanTable.getInstance().getClans())
{
if (clan.getAllyId() == allyId)
{

35
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/spawn/AutoSpawn.java
View File

@@ -430,16 +430,16 @@ public class AutoSpawn
return;
}
final Location[] locationList = spawnInst.getLocationList();
final List<Location> locationList = spawnInst.getLocationList();
// If there are no set co-ordinates, cancel the spawn task.
if (locationList.length == 0)
if (locationList.isEmpty())
{
LOGGER.info("AutoSpawnHandler: No location co-ords specified for spawn instance (Object ID = " + _objectId + ").");
return;
}
final int locationCount = locationList.length;
final int locationCount = locationList.size();
int locationIndex = Rnd.get(locationCount);
// If random spawning is disabled, the spawn at the next set of co-ordinates after the last. If the index is greater than the number of possible spawns, reset the counter to zero.
@@ -457,10 +457,10 @@ public class AutoSpawn
}
// Set the X, Y and Z co-ordinates, where this spawn will take place.
final int x = locationList[locationIndex].getX();
final int y = locationList[locationIndex].getY();
final int z = locationList[locationIndex].getZ();
final int heading = locationList[locationIndex].getHeading();
final int x = locationList.get(locationIndex).getX();
final int y = locationList.get(locationIndex).getY();
final int z = locationList.get(locationIndex).getZ();
final int heading = locationList.get(locationIndex).getHeading();
// Fetch the template for this NPC ID and create a new spawn.
final NpcTemplate npcTemp = NpcTable.getInstance().getTemplate(spawnInst.getNpcId());
@@ -563,7 +563,7 @@ public class AutoSpawn
return;
}
final NpcInstance[] npcs = spawnInst.getNPCInstanceList();
final List<NpcInstance> npcs = spawnInst.getNPCInstanceList();
if (npcs == null)
{
LOGGER.info("AutoSpawnHandler: No spawn registered");
@@ -674,31 +674,24 @@ public class AutoSpawn
return _spawnCount;
}
public Location[] getLocationList()
public List<Location> getLocationList()
{
return _locList.toArray(new Location[_locList.size()]);
return _locList;
}
public NpcInstance[] getNPCInstanceList()
public List<NpcInstance> getNPCInstanceList()
{
NpcInstance[] ret;
synchronized (_npcList)
{
ret = new NpcInstance[_npcList.size()];
_npcList.toArray(ret);
}
return ret;
return _npcList;
}
public Spawn[] getSpawns()
public List<Spawn> getSpawns()
{
final List<Spawn> npcSpawns = new ArrayList<>();
for (NpcInstance npcInst : _npcList)
{
npcSpawns.add(npcInst.getSpawn());
}
return npcSpawns.toArray(new Spawn[npcSpawns.size()]);
return npcSpawns;
}
public void setSpawnCount(int spawnCount)

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@@ -516,14 +516,12 @@ public class GameClient extends ChannelInboundHandler<GameClient>
return player;
}
public void setCharSelection(CharSelectInfoPackage[] chars)
public void setCharSelection(List<CharSelectInfoPackage> characters)
{
_charSlotMapping.clear();
for (CharSelectInfoPackage c : chars)
for (CharSelectInfoPackage character : characters)
{
final int objectId = c.getObjectId();
_charSlotMapping.add(objectId);
_charSlotMapping.add(character.getObjectId());
}
}

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
View File

@@ -93,8 +93,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
int requiredSp = 10000000;
if (_skillType == 0)
{
final SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player, player.getSkillLearningClassId());
for (SkillLearn s : skills)
for (SkillLearn s : SkillTreeTable.getInstance().getAvailableSkills(player, player.getSkillLearningClassId()))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill) || !sk.getCanLearn(player.getSkillLearningClassId()) || !sk.canTeachBy(npcid))
@@ -151,8 +150,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
int costid = 0;
int costcount = 0;
// Skill Learn bug Fix
final SkillLearn[] skillsc = SkillTreeTable.getInstance().getAvailableSkills(player);
for (SkillLearn s : skillsc)
for (SkillLearn s : SkillTreeTable.getInstance().getAvailableSkills(player))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill))
@@ -205,8 +203,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
int itemId = 0;
int repCost = 100000000;
// Skill Learn bug Fix
final PledgeSkillLearn[] skills = SkillTreeTable.getInstance().getAvailablePledgeSkills(player);
for (PledgeSkillLearn s : skills)
for (PledgeSkillLearn s : SkillTreeTable.getInstance().getAvailablePledgeSkills(player))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill))
@@ -295,8 +292,7 @@ public class RequestAquireSkill implements IClientIncomingPacket
// update all the shortcuts to this skill
if (_level > 1)
{
final ShortCut[] allShortCuts = player.getAllShortCuts();
for (ShortCut sc : allShortCuts)
for (ShortCut sc : player.getAllShortCuts())
{
if ((sc.getId() == _id) && (sc.getType() == ShortCut.TYPE_SKILL))
{

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java
View File

@@ -79,8 +79,7 @@ public class RequestAquireSkillInfo implements IClientIncomingPacket
return; // cheater
}
final SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player, player.getSkillLearningClassId());
for (SkillLearn s : skills)
for (SkillLearn s : SkillTreeTable.getInstance().getAvailableSkills(player, player.getSkillLearningClassId()))
{
if ((s.getId() == _id) && (s.getLevel() == _level))
{
@@ -117,8 +116,7 @@ public class RequestAquireSkillInfo implements IClientIncomingPacket
{
int requiredRep = 0;
int itemId = 0;
final PledgeSkillLearn[] skills = SkillTreeTable.getInstance().getAvailablePledgeSkills(player);
for (PledgeSkillLearn s : skills)
for (PledgeSkillLearn s : SkillTreeTable.getInstance().getAvailablePledgeSkills(player))
{
if ((s.getId() == _id) && (s.getLevel() == _level))
{
@@ -141,15 +139,13 @@ public class RequestAquireSkillInfo implements IClientIncomingPacket
}
player.sendPacket(asi);
}
else
// Common Skills
else // Common Skills
{
int costid = 0;
int costcount = 0;
int spcost = 0;
final SkillLearn[] skillsc = SkillTreeTable.getInstance().getAvailableSkills(player);
for (SkillLearn s : skillsc)
for (SkillLearn s : SkillTreeTable.getInstance().getAvailableSkills(player))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill))

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@@ -98,8 +98,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket
byte rate = 0;
int baseLevel = 1;
final EnchantSkillLearn[] skills = SkillTreeTable.getInstance().getAvailableEnchantSkills(player);
for (EnchantSkillLearn s : skills)
for (EnchantSkillLearn s : SkillTreeTable.getInstance().getAvailableEnchantSkills(player))
{
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill) || !sk.getCanLearn(player.getClassId()) || !sk.canTeachBy(npcid))
@@ -189,8 +188,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket
player.sendSkillList();
// update all the shortcuts to this skill
final ShortCut[] allShortCuts = player.getAllShortCuts();
for (ShortCut sc : allShortCuts)
for (ShortCut sc : player.getAllShortCuts())
{
if ((sc.getId() == _skillId) && (sc.getType() == ShortCut.TYPE_SKILL))
{

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
View File

@@ -88,8 +88,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket
return; // cheater
}
final EnchantSkillLearn[] skills = SkillTreeTable.getInstance().getAvailableEnchantSkills(player);
for (EnchantSkillLearn s : skills)
for (EnchantSkillLearn s : SkillTreeTable.getInstance().getAvailableEnchantSkills(player))
{
if ((s.getId() == _skillId) && (s.getLevel() == _skillLevel))
{

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMakeMacro.java
View File

@@ -88,7 +88,7 @@ public class RequestMakeMacro implements IClientIncomingPacket
return;
}
if (player.getMacroses().getAllMacroses().length > 24)
if (player.getMacroses().getAllMacroses().size() > 24)
{
// You may create up to 24 macros.
player.sendPacket(SystemMessageId.YOU_MAY_CREATE_UP_TO_24_MACROS);

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestPledgePowerGradeList.java
View File

@@ -19,7 +19,6 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs;
import org.l2jmobius.gameserver.network.GameClient;
import org.l2jmobius.gameserver.network.serverpackets.PledgePowerGradeList;
@@ -42,8 +41,7 @@ public class RequestPledgePowerGradeList implements IClientIncomingPacket
final Clan clan = player.getClan();
if (clan != null)
{
final RankPrivs[] privs = clan.getAllRankPrivs();
player.sendPacket(new PledgePowerGradeList(privs));
player.sendPacket(new PledgePowerGradeList(clan.getAllRankPrivs()));
}
}
}

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestUnEquipItem.java
View File

@@ -86,23 +86,23 @@ public class RequestUnEquipItem implements IClientIncomingPacket
player.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK);
}
final List<ItemInstance> unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot);
final List<ItemInstance> unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot);
// show the update in the inventory
final InventoryUpdate iu = new InventoryUpdate();
for (ItemInstance element : unequiped)
for (ItemInstance itm : unequipped)
{
player.checkSSMatch(null, element);
iu.addModifiedItem(element);
player.checkSSMatch(null, itm);
iu.addModifiedItem(itm);
}
player.sendPacket(iu);
player.broadcastUserInfo();
// this can be 0 if the user pressed the right mouse button twice very fast
if (!unequiped.isEmpty())
if (!unequipped.isEmpty())
{
SystemMessage sm = null;
final ItemInstance unequippedItem = unequiped.get(0);
final ItemInstance unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/AllyInfo.java
View File

@@ -55,8 +55,8 @@ public class AllyInfo implements IClientOutgoingPacket
if (clan.getAllyId() == _player.getAllyId())
{
clancount++;
online += clan.getOnlineMembers().length;
count += clan.getMembers().length;
online += clan.getOnlineMembers().size();
count += clan.getMembers().size();
}
}
// Connection

16
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/BuyList.java
View File

@@ -33,31 +33,29 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
public class BuyList implements IClientOutgoingPacket
{
private final int _listId;
private final ItemInstance[] _list;
private final List<ItemInstance> _list;
private final int _money;
private double _taxRate = 0;
public BuyList(StoreTradeList list, int currentMoney)
{
_listId = list.getListId();
final List<ItemInstance> lst = list.getItems();
_list = lst.toArray(new ItemInstance[lst.size()]);
_list = list.getItems();
_money = currentMoney;
}
public BuyList(StoreTradeList list, int currentMoney, double taxRate)
{
_listId = list.getListId();
final List<ItemInstance> lst = list.getItems();
_list = lst.toArray(new ItemInstance[lst.size()]);
_list = list.getItems();
_money = currentMoney;
_taxRate = taxRate;
}
public BuyList(List<ItemInstance> lst, int listId, int currentMoney)
public BuyList(List<ItemInstance> list, int listId, int currentMoney)
{
_listId = listId;
_list = lst.toArray(new ItemInstance[lst.size()]);
_list = list;
_money = currentMoney;
}
@@ -67,9 +65,7 @@ public class BuyList implements IClientOutgoingPacket
OutgoingPackets.BUY_LIST.writeId(packet);
packet.writeD(_money); // current money
packet.writeD(_listId);
packet.writeH(_list.length);
packet.writeH(_list.size());
for (ItemInstance item : _list)
{
if ((item.getCount() > 0) || (item.getCount() == -1))

19
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/CharSelectInfo.java
View File

@@ -40,7 +40,7 @@ public class CharSelectInfo implements IClientOutgoingPacket
private final String _loginName;
private final int _sessionId;
private int _activeId;
private final CharSelectInfoPackage[] _characterPackages;
private final List<CharSelectInfoPackage> _characterPackages;
/**
* @param loginName
@@ -62,7 +62,7 @@ public class CharSelectInfo implements IClientOutgoingPacket
_activeId = activeId;
}
public CharSelectInfoPackage[] getCharInfo()
public List<CharSelectInfoPackage> getCharInfo()
{
return _characterPackages;
}
@@ -70,8 +70,9 @@ public class CharSelectInfo implements IClientOutgoingPacket
@Override
public boolean write(PacketWriter packet)
{
final int size = _characterPackages.length;
OutgoingPackets.CHAR_SELECT_INFO.writeId(packet);
final int size = _characterPackages.size();
packet.writeD(size);
long lastAccess = 0;
@@ -79,9 +80,9 @@ public class CharSelectInfo implements IClientOutgoingPacket
{
for (int i = 0; i < size; i++)
{
if (lastAccess < _characterPackages[i].getLastAccess())
if (lastAccess < _characterPackages.get(i).getLastAccess())
{
lastAccess = _characterPackages[i].getLastAccess();
lastAccess = _characterPackages.get(i).getLastAccess();
_activeId = i;
}
}
@@ -89,7 +90,7 @@ public class CharSelectInfo implements IClientOutgoingPacket
for (int i = 0; i < size; i++)
{
final CharSelectInfoPackage charInfoPackage = _characterPackages[i];
final CharSelectInfoPackage charInfoPackage = _characterPackages.get(i);
packet.writeS(charInfoPackage.getName());
packet.writeD(charInfoPackage.getCharId());
packet.writeS(_loginName);
@@ -205,7 +206,7 @@ public class CharSelectInfo implements IClientOutgoingPacket
return true;
}
private CharSelectInfoPackage[] loadCharacterSelectInfo()
private List<CharSelectInfoPackage> loadCharacterSelectInfo()
{
CharSelectInfoPackage charInfopackage;
final List<CharSelectInfoPackage> characterList = new ArrayList<>();
@@ -232,9 +233,7 @@ public class CharSelectInfo implements IClientOutgoingPacket
LOGGER.warning(e.toString());
}
return characterList.toArray(new CharSelectInfoPackage[characterList.size()]);
// return new CharSelectInfoPackage[0];
return characterList;
}
private void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int objectId, int activeClassId)

7
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/GMViewPledgeInfo.java
View File

@@ -16,6 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.commons.util.Chronos;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -60,9 +62,8 @@ public class GMViewPledgeInfo implements IClientOutgoingPacket
packet.writeD(_clan.getAllyCrestId()); // c2
packet.writeD(_clan.isAtWar()); // c3
final ClanMember[] members = _clan.getMembers();
packet.writeD(members.length);
final Collection<ClanMember> members = _clan.getMembers();
packet.writeD(members.size());
for (ClanMember member : members)
{
packet.writeS(member.getName());

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgePowerGradeList.java
View File

@@ -16,6 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.clan.Clan.RankPrivs;
import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -26,9 +28,9 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class PledgePowerGradeList implements IClientOutgoingPacket
{
private final RankPrivs[] _privs;
private final Collection<RankPrivs> _privs;
public PledgePowerGradeList(RankPrivs[] privs)
public PledgePowerGradeList(Collection<RankPrivs> privs)
{
_privs = privs;
}
@@ -37,7 +39,7 @@ public class PledgePowerGradeList implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.PLEDGE_POWER_GRADE_LIST.writeId(packet);
packet.writeD(_privs.length);
packet.writeD(_privs.size());
for (RankPrivs priv : _privs)
{
packet.writeD(priv.getRank());

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
View File

@@ -58,7 +58,7 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket
packet.writeD(_member.getClan().isAtWar());// new c3
packet.writeD(_member.getClan().getMembers().length - 1);
packet.writeD(_member.getClan().getMembers().size() - 1);
for (ClanMember m : _member.getClan().getMembers())
{
// TODO is this c4?

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@@ -63,7 +63,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
packet.writeD(_clan.isAtWar());// new c3
packet.writeD(_clan.getMembers().length - 1);
packet.writeD(_clan.getMembers().size() - 1);
for (ClanMember m : _clan.getMembers())
{
// TODO is this c4?

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
View File

@@ -16,6 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.Skill;
import org.l2jmobius.gameserver.model.clan.Clan;
@@ -27,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class PledgeSkillList implements IClientOutgoingPacket
{
private final Skill[] _skills;
private final Collection<Skill> _skills;
/**
* Instantiates a new pledge skill list.
@@ -42,11 +44,11 @@ public class PledgeSkillList implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.PLEDGE_SKILL_LIST.writeId(packet);
packet.writeD(_skills.length);
for (Skill sk : _skills)
packet.writeD(_skills.size());
for (Skill skill : _skills)
{
packet.writeD(sk.getId());
packet.writeD(sk.getLevel());
packet.writeD(skill.getId());
packet.writeD(skill.getLevel());
}
return true;
}

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListBuy.java
View File

@@ -16,10 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.TradeList.TradeItem;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -31,7 +34,7 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket
private final PlayerInstance _storePlayer;
private final PlayerInstance _player;
private int _playerAdena;
private final TradeList.TradeItem[] _items;
private final List<TradeItem> _items;
public PrivateStoreListBuy(PlayerInstance player, PlayerInstance storePlayer)
{
@@ -58,9 +61,7 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket
OutgoingPackets.PRIVATE_STORE_LIST_BUY.writeId(packet);
packet.writeD(_storePlayer.getObjectId());
packet.writeD(_playerAdena);
packet.writeD(_items.length);
packet.writeD(_items.size());
for (TradeList.TradeItem item : _items)
{
packet.writeD(item.getObjectId());
@@ -68,14 +69,11 @@ public class PrivateStoreListBuy implements IClientOutgoingPacket
packet.writeH(item.getEnchant());
// writeD(item.getCount()); //give max possible sell amount
packet.writeD(item.getCurCount());
packet.writeD(item.getItem().getReferencePrice());
packet.writeH(0);
packet.writeD(item.getItem().getBodyPart());
packet.writeH(item.getItem().getType2());
packet.writeD(item.getPrice()); // buyers price
packet.writeD(item.getCount()); // maximum possible tradecount
}
return true;

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreListSell.java
View File

@@ -16,10 +16,13 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.enums.ChatType;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.TradeList.TradeItem;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -32,7 +35,7 @@ public class PrivateStoreListSell implements IClientOutgoingPacket
private final PlayerInstance _player;
private int _playerAdena;
private final boolean _packageSale;
private final TradeList.TradeItem[] _items;
private final List<TradeItem> _items;
// player's private shop
public PrivateStoreListSell(PlayerInstance player, PlayerInstance storePlayer)
@@ -61,8 +64,7 @@ public class PrivateStoreListSell implements IClientOutgoingPacket
packet.writeD(_storePlayer.getObjectId());
packet.writeD(_packageSale ? 1 : 0);
packet.writeD(_playerAdena);
packet.writeD(_items.length);
packet.writeD(_items.size());
for (TradeList.TradeItem item : _items)
{
packet.writeD(item.getItem().getType2());

5
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListBuy.java
View File

@@ -21,6 +21,7 @@ import java.util.List;
import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeList;
import org.l2jmobius.gameserver.model.TradeList.TradeItem;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
import org.l2jmobius.gameserver.model.items.instance.ItemInstance;
import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -33,7 +34,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket
private final PlayerInstance _player;
private int _playerAdena;
private final List<ItemInstance> _itemList;
private final TradeList.TradeItem[] _buyList;
private final List<TradeItem> _buyList;
public PrivateStoreManageListBuy(PlayerInstance player)
{
@@ -73,7 +74,7 @@ public class PrivateStoreManageListBuy implements IClientOutgoingPacket
}
// section 3
packet.writeD(_buyList.length); // count for all items already added for buy
packet.writeD(_buyList.size()); // count for all items already added for buy
for (TradeList.TradeItem item : _buyList)
{
packet.writeD(item.getItem().getItemId());

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PrivateStoreManageListSell.java
View File

@@ -38,7 +38,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket
private int _playerAdena;
private final boolean _packageSale;
private final List<TradeItem> _itemList;
private final TradeItem[] _sellList;
private final List<TradeItem> _sellList;
public PrivateStoreManageListSell(PlayerInstance player)
{
@@ -86,7 +86,7 @@ public class PrivateStoreManageListSell implements IClientOutgoingPacket
}
// section 3
packet.writeD(_sellList.length); // count for any items already added for sell
packet.writeD(_sellList.size()); // count for any items already added for sell
for (TradeItem item : _sellList)
{
packet.writeD(item.getItem().getType2());

19
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeBookItemList.java
View File

@@ -16,6 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.RecipeList;
import org.l2jmobius.gameserver.network.OutgoingPackets;
@@ -26,7 +28,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class RecipeBookItemList implements IClientOutgoingPacket
{
private RecipeList[] _recipes;
private Collection<RecipeList> _recipes;
private final boolean _isDwarvenCraft;
private final int _maxMp;
@@ -36,7 +38,7 @@ public class RecipeBookItemList implements IClientOutgoingPacket
_maxMp = maxMp;
}
public void addRecipes(RecipeList[] recipeBook)
public void addRecipes(Collection<RecipeList> recipeBook)
{
_recipes = recipeBook;
}
@@ -45,22 +47,21 @@ public class RecipeBookItemList implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.RECIPE_BOOK_ITEM_LIST.writeId(packet);
packet.writeD(_isDwarvenCraft ? 0x00 : 0x01); // 0 = Dwarven - 1 = Common
packet.writeD(_maxMp);
if (_recipes == null)
{
packet.writeD(0);
}
else
{
packet.writeD(_recipes.length); // number of items in recipe book
for (int i = 0; i < _recipes.length; i++)
packet.writeD(_recipes.size()); // number of items in recipe book
int count = 0;
for (RecipeList recipe : _recipes)
{
packet.writeD(_recipes[i].getId());
packet.writeD(i + 1);
count++;
packet.writeD(recipe.getId());
packet.writeD(count);
}
}
return true;

15
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/RecipeShopManageList.java
View File

@@ -16,6 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ManufactureItem;
import org.l2jmobius.gameserver.model.ManufactureList;
@@ -30,7 +32,7 @@ public class RecipeShopManageList implements IClientOutgoingPacket
{
private final PlayerInstance _seller;
private final boolean _isDwarven;
private RecipeList[] _recipes;
private Collection<RecipeList> _recipes;
public RecipeShopManageList(PlayerInstance seller, boolean isDwarven)
{
@@ -73,12 +75,13 @@ public class RecipeShopManageList implements IClientOutgoingPacket
}
else
{
packet.writeD(_recipes.length); // number of items in recipe book
for (int i = 0; i < _recipes.length; i++)
packet.writeD(_recipes.size()); // number of items in recipe book
int count = 0;
for (RecipeList recipe : _recipes)
{
packet.writeD(_recipes[i].getId());
packet.writeD(i + 1);
count++;
packet.writeD(recipe.getId());
packet.writeD(count);
}
}

7
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/ShortCutInit.java
View File

@@ -16,6 +16,8 @@
*/
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.ShortCut;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -27,7 +29,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
*/
public class ShortCutInit implements IClientOutgoingPacket
{
private ShortCut[] _shortCuts;
private Collection<ShortCut> _shortCuts;
private PlayerInstance _player;
public ShortCutInit(PlayerInstance player)
@@ -45,8 +47,7 @@ public class ShortCutInit implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.SHORT_CUT_INIT.writeId(packet);
packet.writeD(_shortCuts.length);
packet.writeD(_shortCuts.size());
for (ShortCut sc : _shortCuts)
{
packet.writeD(sc.getType());

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/TradeUpdate.java
View File

@@ -17,6 +17,7 @@
package org.l2jmobius.gameserver.network.serverpackets;
import java.util.Collection;
import java.util.List;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.model.TradeList;
@@ -31,7 +32,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
public class TradeUpdate implements IClientOutgoingPacket
{
private final Collection<ItemInstance> _items;
private final TradeItem[] _tradeItems;
private final List<TradeItem> _tradeItems;
public TradeUpdate(TradeList trade, PlayerInstance player)
{
@@ -55,8 +56,7 @@ public class TradeUpdate implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.TRADE_UPDATE.writeId(packet);
packet.writeH(_tradeItems.length);
packet.writeH(_tradeItems.size());
for (TradeItem item : _tradeItems)
{
int aveCount = getItemCount(item.getObjectId()) - item.getCount();

11
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/WearList.java
View File

@@ -28,23 +28,22 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
public class WearList implements IClientOutgoingPacket
{
private final int _listId;
private final ItemInstance[] _list;
private final List<ItemInstance> _list;
private final int _money;
private int _expertise;
public WearList(StoreTradeList list, int currentMoney, int expertiseIndex)
{
_listId = list.getListId();
final List<ItemInstance> lst = list.getItems();
_list = lst.toArray(new ItemInstance[lst.size()]);
_list = list.getItems();
_money = currentMoney;
_expertise = expertiseIndex;
}
public WearList(List<ItemInstance> lst, int listId, int currentMoney)
public WearList(List<ItemInstance> list, int listId, int currentMoney)
{
_listId = listId;
_list = lst.toArray(new ItemInstance[lst.size()]);
_list = list;
_money = currentMoney;
}
@@ -52,6 +51,7 @@ public class WearList implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.WEAR_LIST.writeId(packet);
packet.writeC(0xc0); // ?
packet.writeC(0x13); // ?
packet.writeC(0x00); // ?
@@ -88,6 +88,7 @@ public class WearList implements IClientOutgoingPacket
packet.writeD(Config.WEAR_PRICE);
}
}
return true;
}
}