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

Prefer to destroy non equipped items first.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-08-16 02:00:54 +00:00
parent fea923103c
commit 50ef9c8ce6
23 changed files with 253 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -617,8 +617,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -617,8 +617,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -617,8 +617,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -608,8 +608,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -608,8 +608,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -664,8 +664,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -664,8 +664,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -664,8 +664,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -664,8 +664,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -664,8 +664,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -664,8 +664,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -616,8 +616,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -624,8 +624,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -624,8 +624,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**

13
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PlayerInventory.java
View File

@ -624,8 +624,17 @@ public class PlayerInventory extends Inventory
@Override
public ItemInstance destroyItemByItemId(String process, int itemId, long count, PlayerInstance actor, Object reference)
{
final ItemInstance item = getItemByItemId(itemId);
return item == null ? null : destroyItem(process, item, count, actor, reference);
// Attempt to find non equipped items.
ItemInstance destroyItem = null;
for (ItemInstance item : getAllItemsByItemId(itemId))
{
destroyItem = item;
if (!destroyItem.isEquipped())
{
break;
}
}
return destroyItem == null ? null : destroyItem(process, destroyItem, count, actor, reference);
}
/**