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_4.0_DwellingOfSpirits/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;
@@ -484,7 +485,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")));
@@ -515,7 +523,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")));
@@ -546,7 +561,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")));
@@ -577,7 +599,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")));
@@ -608,7 +637,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")));
@@ -639,7 +675,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")));
@@ -670,7 +713,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")));
@@ -701,7 +751,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")));
@@ -732,7 +789,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")));
@@ -763,7 +827,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")));
@@ -806,7 +877,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")));
@@ -837,7 +915,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")));
@@ -868,7 +953,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")));
@@ -899,7 +991,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")));
@@ -930,7 +1029,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")));
@@ -961,7 +1067,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")));
@@ -992,7 +1105,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")));
@@ -1023,7 +1143,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")));
@@ -1054,7 +1181,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")));
@@ -1085,7 +1219,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")));
@@ -1128,7 +1269,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")));
@@ -1159,7 +1307,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")));
@@ -1190,7 +1345,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")));
@@ -1221,7 +1383,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")));
@@ -1252,7 +1421,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")));
@@ -1283,7 +1459,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")));
@@ -1314,7 +1497,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")));
@@ -1345,7 +1535,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")));
@@ -1376,7 +1573,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")));
@@ -1407,7 +1611,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_4.0_DwellingOfSpirits/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_4.0_DwellingOfSpirits/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);
}

6
L2J_Mobius_Essence_4.0_DwellingOfSpirits/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(TALISMAN_OF_ADEN.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(TALISMAN_OF_ADEN.getId()).isEmpty())
{
giveItems(player, TALISMAN_OF_ADEN);
}
if (player.getInventory().getItemsByItemId(TALISMAN_OF_ADEN_ENCHANT.getId()).isEmpty())
if (player.getInventory().getAllItemsByItemId(TALISMAN_OF_ADEN_ENCHANT.getId()).isEmpty())
{
giveItems(player, TALISMAN_OF_ADEN_ENCHANT);
}
@@ -100,7 +100,7 @@ public class Q10971_TalismanEnchant extends Quest
else if (qs.isStarted())
{
boolean foundEnchant = false;
SEARCH: for (ItemInstance item : player.getInventory().getItemsByItemId(TALISMAN_OF_ADEN.getId()))
SEARCH: for (ItemInstance item : player.getInventory().getAllItemsByItemId(TALISMAN_OF_ADEN.getId()))
{
if (item.getEnchantLevel() > 0)
{

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/quests/Q10973_EnchantingAgathions/Q10973_EnchantingAgathions.java vendored
View File

@@ -78,7 +78,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_4.0_DwellingOfSpirits/dist/game/data/scripts/quests/Q10974_NewStylishEquipment/Q10974_NewStylishEquipment.java vendored
View File

@@ -78,11 +78,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);
}
@@ -94,7 +94,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)
{
@@ -116,11 +116,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);
}
@@ -132,7 +132,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)
{
@@ -154,11 +154,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);
}
@@ -170,7 +170,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)
{
@@ -217,7 +217,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)
{
@@ -239,7 +239,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)
{
@@ -261,7 +261,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)
{