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

Removal of enhanced inventory methods.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-04-20 22:20:41 +00:00
parent 210717c77f
commit 1b68632161
425 changed files with 4564 additions and 3177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

273
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/ai/others/GameAssistant/GameAssistant.java vendored
View File

@@ -16,7 +16,8 @@
*/
package ai.others.GameAssistant;
import java.util.Collection;
import java.util.ArrayList;
import java.util.List;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.data.xml.MultisellData;
@@ -326,7 +327,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_1":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 1) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 1) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -357,7 +365,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_2":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 2) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 2) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -388,7 +403,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_3":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 3) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 3) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -419,7 +441,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_4":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 4) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 4) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -450,7 +479,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_5":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 5) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 5) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -481,7 +517,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_6":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 6) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 6) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -512,7 +555,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_7":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 7) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 7) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -543,7 +593,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_8":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 8) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 8) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -574,7 +631,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_9":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 9) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 9) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -605,7 +669,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_black_sayha_cloak_10":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 10) && (item.getId() == BLACK_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 10) && (item.getId() == BLACK_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -648,7 +719,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_1":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 1) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 1) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -679,7 +757,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_2":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 2) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 2) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -710,7 +795,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_3":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 3) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 3) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -741,7 +833,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_4":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 4) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 4) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -772,7 +871,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_5":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 5) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 5) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -803,7 +909,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_6":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 6) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 6) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -834,7 +947,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_7":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 7) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 7) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -865,7 +985,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_8":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 8) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 8) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -896,7 +1023,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_9":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 9) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 9) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -927,7 +1061,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_white_sayha_cloak_10":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 10) && (item.getId() == WHITE_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 10) && (item.getId() == WHITE_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -970,7 +1111,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_1":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 1) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 1) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1001,7 +1149,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_2":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 2) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 2) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1032,7 +1187,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_3":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 3) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 3) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1063,7 +1225,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_4":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 4) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 4) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1094,7 +1263,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_5":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 5) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 5) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1125,7 +1301,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_6":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 6) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 6) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1156,7 +1339,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_7":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 7) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 7) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1187,7 +1377,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_8":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 8) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 8) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1218,7 +1415,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_9":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 9) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 9) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));
@@ -1249,7 +1453,14 @@ public class GameAssistant extends AbstractNpcAI
}
case "exc_red_sayha_cloak_10":
{
final Collection<ItemInstance> cloaks = player.getInventory().getItems(item -> (item.getEnchantLevel() == 10) && (item.getId() == RED_SAYHA_CLOAK));
final List<ItemInstance> cloaks = new ArrayList<>();
for (ItemInstance item : player.getInventory().getItems())
{
if ((item.getEnchantLevel() == 10) && (item.getId() == RED_SAYHA_CLOAK))
{
cloaks.add(item);
}
}
if (cloaks.isEmpty())
{
player.sendPacket(new ExPremiumManagerShowHtml(HtmCache.getInstance().getHtm(player, "data/scripts/ai/others/GameAssistant/no_cloak.html")));

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/RestorationRandom.java vendored
View File

@@ -138,7 +138,7 @@ public class RestorationRandom extends AbstractEffect
}
else
{
for (ItemInstance itemInstance : player.getInventory().getItemsByItemId(entry.getKey().getId()))
for (ItemInstance itemInstance : player.getInventory().getAllItemsByItemId(entry.getKey().getId()))
{
playerIU.addModifiedItem(itemInstance);
}

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/skillconditionhandlers/OpEncumberedSkillCondition.java vendored
View File

@@ -47,7 +47,7 @@ public class OpEncumberedSkillCondition implements ISkillCondition
}
final PlayerInstance player = caster.getActingPlayer();
final int currentSlotsPercent = calcPercent(player.getInventoryLimit(), player.getInventory().getSize(item -> !item.isQuestItem()));
final int currentSlotsPercent = calcPercent(player.getInventoryLimit(), player.getInventory().getNonQuestSize());
final int currentWeightPercent = calcPercent(player.getMaxLoad(), player.getCurrentLoad());
return (currentSlotsPercent >= _slotsPercent) && (currentWeightPercent >= _weightPercent);
}

10
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10290_ATripBegins/Q10290_ATripBegins.java vendored
View File

@@ -148,24 +148,24 @@ public class Q10290_ATripBegins extends Quest
showOnScreenMsg(player, NpcStringId.YOU_VE_GOT_ADVENTURER_S_BRACELET_AND_ADVENTURER_S_TALISMAN_NCOMPLETE_THE_TUTORIAL_AND_TRY_TO_USE_THE_TALISMAN, ExShowScreenMessage.TOP_CENTER, 10000);
addExpAndSp(player, (ExperienceData.getInstance().getExpForLevel(25) + 100) - player.getExp(), 42000);
// TODO: find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting).
if (player.getInventory().getItemsByItemId(BSOE_EVENT.getId()).size() <= 20)
if (player.getInventory().getAllItemsByItemId(BSOE_EVENT.getId()).size() <= 20)
{
// 20 due other quest rewards? Need to see for a possible to add a variable here.
giveItems(player, BSOE_EVENT);
}
if (player.getInventory().getItemsByItemId(ADVENTURERS_BRACELET.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ADVENTURERS_BRACELET.getId()).isEmpty())
{
giveItems(player, ADVENTURERS_BRACELET);
}
if (player.getInventory().getItemsByItemId(ADVENTURERS_TALISMAN.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ADVENTURERS_TALISMAN.getId()).isEmpty())
{
giveItems(player, ADVENTURERS_TALISMAN);
}
if (player.getInventory().getItemsByItemId(SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN.getId()).isEmpty())
{
giveItems(player, SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN);
}
if (player.getInventory().getItemsByItemId(SCROLL_OF_ENCHANT_ADEN_WEAPON.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(SCROLL_OF_ENCHANT_ADEN_WEAPON.getId()).isEmpty())
{
giveItems(player, SCROLL_OF_ENCHANT_ADEN_WEAPON);
}

6
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10971_TalismanEnchant/Q10971_TalismanEnchant.java vendored
View File

@@ -73,11 +73,11 @@ public class Q10971_TalismanEnchant extends Quest
qs.startQuest();
player.sendPacket(new ExTutorialShowId(47));
// TODO: Find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting).
if (player.getInventory().getItemsByItemId(ADVENTURERS_TALISMAN.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ADVENTURERS_TALISMAN.getId()).isEmpty())
{
giveItems(player, ADVENTURERS_TALISMAN);
}
if (player.getInventory().getItemsByItemId(SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN.getId()).isEmpty())
{
giveItems(player, SCROLL_OF_ENCHANT_ADVENTURERS_TALISMAN);
}
@@ -100,7 +100,7 @@ public class Q10971_TalismanEnchant extends Quest
else if (qs.isStarted())
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(ADVENTURERS_TALISMAN.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(ADVENTURERS_TALISMAN.getId()))
{
if (item.getEnchantLevel() > 0)
{

2
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java vendored
View File

@@ -81,7 +81,7 @@ public class Q10973_EnchantingAgathions extends Quest
if (qs.isStarted())
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(TRAVELER_AGATHION_GRIFFIN))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(TRAVELER_AGATHION_GRIFFIN))
{
if (item.getEnchantLevel() > 0)
{

24
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java vendored
View File

@@ -80,11 +80,11 @@ public class Q10974_NewStylishEquipment extends Quest
{
qs.startQuest();
// TODO: Find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting).
if (player.getInventory().getItemsByItemId(ADVENTURER_SHEEP_HAT.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ADVENTURER_SHEEP_HAT.getId()).isEmpty())
{
giveItems(player, ADVENTURER_SHEEP_HAT);
}
if (player.getInventory().getItemsByItemId(ENCHANT_SCROLL_ADVENTURER_SHEEP_HAT.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ENCHANT_SCROLL_ADVENTURER_SHEEP_HAT.getId()).isEmpty())
{
giveItems(player, ENCHANT_SCROLL_ADVENTURER_SHEEP_HAT);
}
@@ -96,7 +96,7 @@ public class Q10974_NewStylishEquipment extends Quest
if (qs.isCond(1))
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(ADVENTURER_SHEEP_HAT.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(ADVENTURER_SHEEP_HAT.getId()))
{
if (item.getEnchantLevel() > 0)
{
@@ -118,11 +118,11 @@ public class Q10974_NewStylishEquipment extends Quest
{
qs.startQuest();
// TODO: Find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting).
if (player.getInventory().getItemsByItemId(ADVENTURER_BELT.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ADVENTURER_BELT.getId()).isEmpty())
{
giveItems(player, ADVENTURER_BELT);
}
if (player.getInventory().getItemsByItemId(ENCHANT_SCROLL_ADVENTURER_BELT.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ENCHANT_SCROLL_ADVENTURER_BELT.getId()).isEmpty())
{
giveItems(player, ENCHANT_SCROLL_ADVENTURER_BELT);
}
@@ -134,7 +134,7 @@ public class Q10974_NewStylishEquipment extends Quest
if (qs.isCond(2))
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(ADVENTURER_BELT.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(ADVENTURER_BELT.getId()))
{
if (item.getEnchantLevel() > 0)
{
@@ -156,11 +156,11 @@ public class Q10974_NewStylishEquipment extends Quest
{
qs.startQuest();
// TODO: Find a better way to do this: Tempfix for not giving items when already have them in inventory (bugging abort and re-accepting).
if (player.getInventory().getItemsByItemId(ADVENTURER_CLOAK.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ADVENTURER_CLOAK.getId()).isEmpty())
{
giveItems(player, ADVENTURER_CLOAK);
}
if (player.getInventory().getItemsByItemId(ENCHANT_SCROLL_ADVENTURER_CLOAK.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(ENCHANT_SCROLL_ADVENTURER_CLOAK.getId()).isEmpty())
{
giveItems(player, ENCHANT_SCROLL_ADVENTURER_CLOAK);
}
@@ -172,7 +172,7 @@ public class Q10974_NewStylishEquipment extends Quest
if (qs.isCond(3))
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(ADVENTURER_CLOAK.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(ADVENTURER_CLOAK.getId()))
{
if (item.getEnchantLevel() > 0)
{
@@ -221,7 +221,7 @@ public class Q10974_NewStylishEquipment extends Quest
case 1:
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(ADVENTURER_SHEEP_HAT.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(ADVENTURER_SHEEP_HAT.getId()))
{
if (item.getEnchantLevel() > 0)
{
@@ -243,7 +243,7 @@ public class Q10974_NewStylishEquipment extends Quest
case 2:
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(ADVENTURER_BELT.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(ADVENTURER_BELT.getId()))
{
if (item.getEnchantLevel() > 0)
{
@@ -265,7 +265,7 @@ public class Q10974_NewStylishEquipment extends Quest
case 3:
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(ADVENTURER_CLOAK.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(ADVENTURER_CLOAK.getId()))
{
if (item.getEnchantLevel() > 0)
{