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

Make use of Set when checking for contained objects.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-02-26 08:51:56 +00:00
parent 8955a8cb24
commit 278fb0e193
839 changed files with 6926 additions and 5782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/bypasshandlers/Link.java vendored
View File

@@ -16,7 +16,9 @@
*/
package handlers.bypasshandlers;
import org.l2jmobius.commons.util.CommonUtil;
import java.util.HashSet;
import java.util.Set;
import org.l2jmobius.gameserver.cache.HtmCache;
import org.l2jmobius.gameserver.handler.IBypassHandler;
import org.l2jmobius.gameserver.model.actor.Creature;
@@ -31,50 +33,51 @@ public class Link implements IBypassHandler
"Link"
};
private static final String[] VALID_LINKS =
private static final Set<String> VALID_LINKS = new HashSet<>();
static
{
"adventurer_guildsman/AboutHighLevelGuilds.htm",
"adventurer_guildsman/AboutNewLifeCrystals.htm",
"clanHallDoorman/evolve.htm",
"common/augmentation_01.htm",
"common/augmentation_02.htm",
"common/crafting_01.htm",
"common/duals_01.htm",
"common/duals_02.htm",
"common/duals_03.htm",
"common/g_cube_warehouse001.htm",
"common/skill_enchant_help.htm",
"common/skill_enchant_help_01.htm",
"common/skill_enchant_help_02.htm",
"common/skill_enchant_help_03.htm",
"common/weapon_sa_01.htm",
"common/welcomeback002.htm",
"common/welcomeback003.htm",
"default/BlessingOfProtection.htm",
"default/SupportMagic.htm",
"default/SupportMagicServitor.htm",
"fisherman/fishing_championship.htm",
"fortress/foreman.htm",
"guard/kamaloka_help.htm",
"guard/kamaloka_level.htm",
"olympiad/hero_main2.htm",
"petmanager/evolve.htm",
"petmanager/exchange.htm",
"petmanager/instructions.htm",
"seven_signs/blkmrkt_1.htm",
"seven_signs/blkmrkt_2.htm",
"seven_signs/mammblack_1a.htm",
"seven_signs/mammblack_1b.htm",
"seven_signs/mammblack_1c.htm",
"seven_signs/mammblack_2a.htm",
"seven_signs/mammblack_2b.htm",
"seven_signs/mammmerch_1.htm",
"seven_signs/mammmerch_1a.htm",
"seven_signs/mammmerch_1b.htm",
"teleporter/separatedsoul.htm",
"warehouse/clanwh.htm",
"warehouse/privatewh.htm",
};
VALID_LINKS.add("adventurer_guildsman/AboutHighLevelGuilds.htm");
VALID_LINKS.add("adventurer_guildsman/AboutNewLifeCrystals.htm");
VALID_LINKS.add("clanHallDoorman/evolve.htm");
VALID_LINKS.add("common/augmentation_01.htm");
VALID_LINKS.add("common/augmentation_02.htm");
VALID_LINKS.add("common/crafting_01.htm");
VALID_LINKS.add("common/duals_01.htm");
VALID_LINKS.add("common/duals_02.htm");
VALID_LINKS.add("common/duals_03.htm");
VALID_LINKS.add("common/g_cube_warehouse001.htm");
VALID_LINKS.add("common/skill_enchant_help.htm");
VALID_LINKS.add("common/skill_enchant_help_01.htm");
VALID_LINKS.add("common/skill_enchant_help_02.htm");
VALID_LINKS.add("common/skill_enchant_help_03.htm");
VALID_LINKS.add("common/weapon_sa_01.htm");
VALID_LINKS.add("common/welcomeback002.htm");
VALID_LINKS.add("common/welcomeback003.htm");
VALID_LINKS.add("default/BlessingOfProtection.htm");
VALID_LINKS.add("default/SupportMagic.htm");
VALID_LINKS.add("default/SupportMagicServitor.htm");
VALID_LINKS.add("fisherman/fishing_championship.htm");
VALID_LINKS.add("fortress/foreman.htm");
VALID_LINKS.add("guard/kamaloka_help.htm");
VALID_LINKS.add("guard/kamaloka_level.htm");
VALID_LINKS.add("olympiad/hero_main2.htm");
VALID_LINKS.add("petmanager/evolve.htm");
VALID_LINKS.add("petmanager/exchange.htm");
VALID_LINKS.add("petmanager/instructions.htm");
VALID_LINKS.add("seven_signs/blkmrkt_1.htm");
VALID_LINKS.add("seven_signs/blkmrkt_2.htm");
VALID_LINKS.add("seven_signs/mammblack_1a.htm");
VALID_LINKS.add("seven_signs/mammblack_1b.htm");
VALID_LINKS.add("seven_signs/mammblack_1c.htm");
VALID_LINKS.add("seven_signs/mammblack_2a.htm");
VALID_LINKS.add("seven_signs/mammblack_2b.htm");
VALID_LINKS.add("seven_signs/mammmerch_1.htm");
VALID_LINKS.add("seven_signs/mammmerch_1a.htm");
VALID_LINKS.add("seven_signs/mammmerch_1b.htm");
VALID_LINKS.add("teleporter/separatedsoul.htm");
VALID_LINKS.add("warehouse/clanwh.htm");
VALID_LINKS.add("warehouse/privatewh.htm");
}
@Override
public boolean useBypass(String command, Player player, Creature target)
@@ -92,12 +95,13 @@ public class Link implements IBypassHandler
return false;
}
String content = CommonUtil.contains(VALID_LINKS, htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null;
String content = VALID_LINKS.contains(htmlPath) ? HtmCache.getInstance().getHtm(player, "data/html/" + htmlPath) : null;
// Precaution.
if (htmlPath.startsWith("teleporter/") && !(player.getTarget() instanceof Teleporter))
{
content = null;
}
final NpcHtmlMessage html = new NpcHtmlMessage(target != null ? target.getObjectId() : 0);
if (content != null)
{

15
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/itemhandlers/PetFood.java vendored
View File

@@ -16,7 +16,7 @@
*/
package handlers.itemhandlers;
import java.util.List;
import java.util.Set;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.data.xml.PetDataTable;
@@ -82,15 +82,12 @@ public class PetFood implements IItemHandler
final Player player = activeChar.getActingPlayer();
if (player.isMounted())
{
final List<Integer> foodIds = PetDataTable.getInstance().getPetData(player.getMountNpcId()).getFood();
if (foodIds.contains(item.getId()))
final Set<Integer> foodIds = PetDataTable.getInstance().getPetData(player.getMountNpcId()).getFood();
if (foodIds.contains(item.getId()) && player.destroyItem("Consume", item.getObjectId(), 1, null, false))
{
if (player.destroyItem("Consume", item.getObjectId(), 1, null, false))
{
player.broadcastPacket(new MagicSkillUse(player, player, skillId, skillLevel, 0, 0));
player.setCurrentFeed(player.getCurrentFeed() + skill.getFeed());
return true;
}
player.broadcastPacket(new MagicSkillUse(player, player, skillId, skillLevel, 0, 0));
player.setCurrentFeed(player.getCurrentFeed() + skill.getFeed());
return true;
}
}
final SystemMessage sm = new SystemMessage(SystemMessageId.S1_CANNOT_BE_USED_DUE_TO_UNSUITABLE_TERMS);