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

3
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/admincommandhandlers/AdminMobGroup.java vendored
View File

@@ -594,9 +594,8 @@ 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().getId() + " (" + mobGroup.getStatus() + ")");
}

3
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java vendored
View File

@@ -99,9 +99,8 @@ public class ItemAuctionLink implements IBypassHandler
}
else if ("cancel".equalsIgnoreCase(cmd))
{
final ItemAuction[] auctions = au.getAuctionsByBidder(player.getObjectId());
boolean returned = false;
for (ItemAuction auction : auctions)
for (ItemAuction auction : au.getAuctionsByBidder(player.getObjectId()))
{
if (auction.cancelBid(player))
{

9
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ConvertItem.java vendored
View File

@@ -16,6 +16,8 @@
*/
package handlers.effecthandlers;
import java.util.List;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
@@ -84,7 +86,7 @@ public class ConvertItem extends AbstractEffect
final int enchantLevel = wpn.getEnchantLevel();
final AttributeHolder elementals = wpn.getAttributes() == null ? null : wpn.getAttackAttribute();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
final List<ItemInstance> unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(wpn.getItem().getBodyPart());
final InventoryUpdate iu = new InventoryUpdate();
for (ItemInstance unequippedItem : unequiped)
{
@@ -92,10 +94,11 @@ public class ConvertItem extends AbstractEffect
}
player.sendInventoryUpdate(iu);
if (unequiped.length <= 0)
if (unequiped.isEmpty())
{
return;
}
byte count = 0;
for (ItemInstance unequippedItem : unequiped)
{
@@ -120,7 +123,7 @@ public class ConvertItem extends AbstractEffect
player.sendPacket(sm);
}
if (count == unequiped.length)
if (count == unequiped.size())
{
return;
}

18
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/Disarmor.java vendored
View File

@@ -16,6 +16,7 @@
*/
package handlers.effecthandlers;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -67,11 +68,11 @@ public class Disarmor extends AbstractEffect
}
final PlayerInstance player = effected.getActingPlayer();
final ItemInstance[] unequiped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot);
if (unequiped.length > 0)
final List<ItemInstance> unequipped = player.getInventory().unEquipItemInBodySlotAndRecord(_slot);
if (!unequipped.isEmpty())
{
final InventoryUpdate iu = new InventoryUpdate();
for (ItemInstance itm : unequiped)
for (ItemInstance itm : unequipped)
{
iu.addModifiedItem(itm);
}
@@ -79,20 +80,21 @@ public class Disarmor extends AbstractEffect
player.broadcastUserInfo();
SystemMessage sm = null;
if (unequiped[0].getEnchantLevel() > 0)
final ItemInstance unequippedItem = unequipped.get(0);
if (unequippedItem.getEnchantLevel() > 0)
{
sm = new SystemMessage(SystemMessageId.THE_EQUIPMENT_S1_S2_HAS_BEEN_REMOVED);
sm.addInt(unequiped[0].getEnchantLevel());
sm.addItemName(unequiped[0]);
sm.addInt(unequippedItem.getEnchantLevel());
sm.addItemName(unequippedItem);
}
else
{
sm = new SystemMessage(SystemMessageId.S1_HAS_BEEN_UNEQUIPPED);
sm.addItemName(unequiped[0]);
sm.addItemName(unequippedItem);
}
player.sendPacket(sm);
effected.getInventory().blockItemSlot(_slot);
_unequippedItems.put(effected.getObjectId(), unequiped[0].getObjectId());
_unequippedItems.put(effected.getObjectId(), unequippedItem.getObjectId());
}
}

2
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ChangeAttributeCrystal.java vendored
View File

@@ -82,7 +82,7 @@ public class ChangeAttributeCrystal implements IItemHandler
return false;
}
player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList.toArray(new ItemInfo[itemList.size()])));
player.sendPacket(new ExChangeAttributeItemList(item.getId(), itemList));
return true;
}
}

4
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/Recipes.java vendored
View File

@@ -72,13 +72,13 @@ public class Recipes implements IItemHandler
{
canCraft = player.hasDwarvenCraft();
recipeLevel = (rp.getLevel() > player.getDwarvenCraft());
recipeLimit = (player.getDwarvenRecipeBook().length >= player.getDwarfRecipeLimit());
recipeLimit = (player.getDwarvenRecipeBook().size() >= player.getDwarfRecipeLimit());
}
else
{
canCraft = player.hasCommonCraft();
recipeLevel = (rp.getLevel() > player.getCommonCraft());
recipeLimit = (player.getCommonRecipeBook().length >= player.getCommonRecipeLimit());
recipeLimit = (player.getCommonRecipeBook().size() >= player.getCommonRecipeLimit());
}
if (!canCraft)