Use equals for contains method object comparison.

Contributed by Sahar.
2018-05-06 21:22:15 +00:00
parent 159bf75e2f
commit 34d175b45b
60 changed files with 159 additions and 187 deletions
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -458,7 +458,7 @@ public final class CommonUtil
 	{
 		for (T element : array)
 		{
-			if (element == obj)
+			if (element.equals(obj))
 			{
 				return true;
 			}
--- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -458,7 +458,7 @@ public final class CommonUtil
 	{
 		for (T element : array)
 		{
-			if (element == obj)
+			if (element.equals(obj))
 			{
 				return true;
 			}
--- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -458,7 +458,7 @@ public final class CommonUtil
 	{
 		for (T element : array)
 		{
-			if (element == obj)
+			if (element.equals(obj))
 			{
 				return true;
 			}
--- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -458,7 +458,7 @@ public final class CommonUtil
 	{
 		for (T element : array)
 		{
-			if (element == obj)
+			if (element.equals(obj))
 			{
 				return true;
 			}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/BeastFarm.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/BeastFarm.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.model.L2Object;
@@ -32,7 +33,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2TamedBeastInstance;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.serverpackets.AbstractNpcInfo;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;
 import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
@@ -247,7 +247,7 @@ public final class BeastFarm extends AbstractNpcAI
 		
 		// if this is finally a trained mob, then despawn any other trained mobs that the
 		// player might have and initialize the Tamed Beast.
-		if (Util.contains(TAMED_BEASTS, nextNpcId))
+		if (CommonUtil.contains(TAMED_BEASTS, nextNpcId))
 		{
 			final L2TamedBeastInstance nextNpc = new L2TamedBeastInstance(nextNpcId, player, food, npc.getX(), npc.getY(), npc.getZ(), true);
 			
@@ -309,7 +309,7 @@ public final class BeastFarm extends AbstractNpcAI
 	{
 		// this behavior is only run when the target of skill is the passed npc (chest)
 		// i.e. when the player is attempting to open the chest using a skill
-		if (!Util.contains(targets, npc))
+		if (!CommonUtil.contains(targets, npc))
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
@@ -317,7 +317,7 @@ public final class BeastFarm extends AbstractNpcAI
 		final int npcId = npc.getId();
 		final int skillId = skill.getId();
 		// check if the npc and skills used are valid for this script. Exit if invalid.
-		if (!Util.contains(FEEDABLE_BEASTS, npcId) || ((skillId != SKILL_GOLDEN_SPICE) && (skillId != SKILL_CRYSTAL_SPICE) && (skillId != SKILL_BLESSED_GOLDEN_SPICE) && (skillId != SKILL_BLESSED_CRYSTAL_SPICE) && (skillId != SKILL_SGRADE_GOLDEN_SPICE) && (skillId != SKILL_SGRADE_CRYSTAL_SPICE)))
+		if (!CommonUtil.contains(FEEDABLE_BEASTS, npcId) || ((skillId != SKILL_GOLDEN_SPICE) && (skillId != SKILL_CRYSTAL_SPICE) && (skillId != SKILL_BLESSED_GOLDEN_SPICE) && (skillId != SKILL_BLESSED_CRYSTAL_SPICE) && (skillId != SKILL_SGRADE_GOLDEN_SPICE) && (skillId != SKILL_SGRADE_CRYSTAL_SPICE)))
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/BeastFarm/FeedableBeasts.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.L2Object;
@@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2TamedBeastInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.NpcStringId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;
 import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
@@ -419,7 +419,7 @@ public final class FeedableBeasts extends AbstractNpcAI
 		
 		// if this is finally a trained mob, then despawn any other trained mobs that the
 		// player might have and initialize the Tamed Beast.
-		if (Util.contains(TAMED_BEASTS, nextNpcId))
+		if (CommonUtil.contains(TAMED_BEASTS, nextNpcId))
 		{
 			if ((player.getTrainedBeasts() != null) && !player.getTrainedBeasts().isEmpty())
 			{
@@ -513,7 +513,7 @@ public final class FeedableBeasts extends AbstractNpcAI
 	{
 		// this behavior is only run when the target of skill is the passed npc (chest)
 		// i.e. when the player is attempting to open the chest using a skill
-		if (!Util.contains(targets, npc))
+		if (!CommonUtil.contains(targets, npc))
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
@@ -590,7 +590,7 @@ public final class FeedableBeasts extends AbstractNpcAI
 				spawnNext(npc, growthLevel, caster, food);
 			}
 		}
-		else if (Util.contains(TAMED_BEASTS, npcId) && (npc instanceof L2TamedBeastInstance))
+		else if (CommonUtil.contains(TAMED_BEASTS, npcId) && (npc instanceof L2TamedBeastInstance))
 		{
 			final L2TamedBeastInstance beast = ((L2TamedBeastInstance) npc);
 			if (skillId == beast.getFoodType())
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DenOfEvil/DenOfEvil.java
@@ -17,6 +17,7 @@
 package ai.areas.DenOfEvil;

 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
 import com.l2jmobius.gameserver.model.Location;
@@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.model.zone.type.L2EffectZone;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -213,7 +213,7 @@ public final class DenOfEvil extends AbstractNpcAI
 						{
 							// respawn eye
 							final L2Npc npc = (L2Npc) character;
-							if (Util.contains(EYE_IDS, npc.getId()))
+							if (CommonUtil.contains(EYE_IDS, npc.getId()))
 							{
 								ThreadPool.schedule(new RespawnNewEye(npc.getLocation()), 15000);
 							}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonValley.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/DragonValley/DragonValley.java
@@ -18,6 +18,7 @@ package ai.areas.DragonValley;

 import java.util.EnumMap;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.L2Attackable;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.L2Playable;
@@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.holders.SkillHolder;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -203,7 +203,7 @@ public final class DragonValley extends AbstractNpcAI
 		{
 			startQuestTimer("SELF_DESTRUCTION", 3000, npc, null);
 		}
-		else if (Util.contains(SPAWN_ANIMATION, npc.getId()))
+		else if (CommonUtil.contains(SPAWN_ANIMATION, npc.getId()))
 		{
 			npc.setShowSummonAnimation(true);
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/EnergySeeds.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentHashMap;

 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.DoorData;
 import com.l2jmobius.gameserver.data.xml.impl.NpcData;
@@ -44,7 +45,6 @@ import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.model.zone.L2ZoneType;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.ActionFailed;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;
 import quests.Q00692_HowtoOpposeEvil.Q00692_HowtoOpposeEvil;
@@ -311,7 +311,7 @@ public class EnergySeeds extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if (!Util.contains(targets, npc) || (skill.getId() != 5780))
+		if (!CommonUtil.contains(targets, npc) || (skill.getId() != 5780))
 		{
 			return super.onSkillSee(npc, caster, skill, targets, isSummon);
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -20,6 +20,7 @@ import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jmobius.gameserver.instancemanager.ZoneManager;
@@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.zone.L2ZoneType;
 import com.l2jmobius.gameserver.model.zone.type.L2EffectZone;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -286,7 +286,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI
 	{
 		for (SeedRegion element : _regionsData)
 		{
-			if (Util.contains(element.elite_mob_ids, npc.getId()))
+			if (CommonUtil.contains(element.elite_mob_ids, npc.getId()))
 			{
 				spawnGroupOfMinion((L2MonsterInstance) npc, element.minion_lists[getRandom(element.minion_lists.length)]);
 			}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionAttack/HallOfErosionAttack.java
@@ -22,6 +22,7 @@ import java.util.List;

 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -505,7 +506,7 @@ public class HallOfErosionAttack extends AbstractNpcAI
 	@Override
 	public final String onSpawn(L2Npc npc)
 	{
-		if (Util.contains(NOTMOVE, npc.getId()))
+		if (CommonUtil.contains(NOTMOVE, npc.getId()))
 		{
 			npc.setIsNoRndWalk(true);
 			npc.setIsImmobilized(true);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HallOfErosionDefence/HallOfErosionDefence.java
@@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledFuture;

 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
@@ -496,7 +497,7 @@ public class HallOfErosionDefence extends AbstractNpcAI
 	@Override
 	public final String onSpawn(L2Npc npc)
 	{
-		if (Util.contains(NOTMOVE, npc.getId()))
+		if (CommonUtil.contains(NOTMOVE, npc.getId()))
 		{
 			npc.setIsNoRndWalk(true);
 			npc.setIsImmobilized(true);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityAttack/HeartInfinityAttack.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ScheduledFuture;

 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -553,7 +554,7 @@ public class HeartInfinityAttack extends AbstractNpcAI
 	@Override
 	public final String onSpawn(L2Npc npc)
 	{
-		if (Util.contains(NOTMOVE, npc.getId()))
+		if (CommonUtil.contains(NOTMOVE, npc.getId()))
 		{
 			npc.setIsNoRndWalk(true);
 			npc.setIsImmobilized(true);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/HeartInfinityDefence/HeartInfinityDefence.java
@@ -22,6 +22,7 @@ import java.util.concurrent.ScheduledFuture;

 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -554,7 +555,7 @@ public class HeartInfinityDefence extends AbstractNpcAI
 	@Override
 	public final String onSpawn(L2Npc npc)
 	{
-		if (Util.contains(NOTMOVE, npc.getId()))
+		if (CommonUtil.contains(NOTMOVE, npc.getId()))
 		{
 			npc.setIsNoRndWalk(true);
 			npc.setIsImmobilized(true);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/Gracia/instances/SeedOfDestruction/SeedOfDestruction.java
@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -934,7 +935,7 @@ public class SeedOfDestruction extends AbstractNpcAI
 			final int instanceId = world.getInstanceId();
 			for (L2DoorInstance door : InstanceManager.getInstance().getInstance(instanceId).getDoors())
 			{
-				if (contains(ATTACKABLE_DOORS, door.getId()))
+				if (CommonUtil.contains(ATTACKABLE_DOORS, door.getId()))
 				{
 					door.setIsAttackableDoor(true);
 				}
@@ -986,18 +987,6 @@ public class SeedOfDestruction extends AbstractNpcAI
 		}
 	}
 	
-	public static boolean contains(int[] array, int obj)
-	{
-		for (int element : array)
-		{
-			if (element == obj)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	
 	private void teleportplayerEnergy(L2PcInstance player, teleCoord teleto)
 	{
 		player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java
@@ -16,6 +16,7 @@
 */
 package ai.areas.PrimevalIsle;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.geoengine.GeoEngine;
@@ -244,7 +245,7 @@ public final class PrimevalIsle extends AbstractNpcAI
 	@Override
 	public String onSeeCreature(L2Npc npc, L2Character creature, boolean isSummon)
 	{
-		if (Util.contains(MONSTERS, npc.getId()))
+		if (CommonUtil.contains(MONSTERS, npc.getId()))
 		{
 			if (creature.isPlayer())
 			{
@@ -293,7 +294,7 @@ public final class PrimevalIsle extends AbstractNpcAI
 				}
 			}
 		}
-		else if (Util.contains(VEGETABLE, creature.getId()))
+		else if (CommonUtil.contains(VEGETABLE, creature.getId()))
 		{
 			npc.setTarget(creature);
 			npc.doCast(CREW_SKILL.getSkill());
@@ -334,7 +335,7 @@ public final class PrimevalIsle extends AbstractNpcAI
 				});
 			}
 		}
-		else if (Util.contains(TREX, npc.getId()))
+		else if (CommonUtil.contains(TREX, npc.getId()))
 		{
 			final L2Attackable mob = (L2Attackable) npc;
 			final L2Character target = mob.getMostHated();
@@ -483,11 +484,11 @@ public final class PrimevalIsle extends AbstractNpcAI
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
-		if (Util.contains(SPRIGNANT, npc.getId()))
+		if (CommonUtil.contains(SPRIGNANT, npc.getId()))
 		{
 			startQuestTimer("USE_SKILL", 15000, npc, null);
 		}
-		else if (Util.contains(TREX, npc.getId()))
+		else if (CommonUtil.contains(TREX, npc.getId()))
 		{
 			final int collectGhost = npc.getTemplate().getParameters().getInt("CollectGhost", 0);
 			final int collectDespawn = npc.getTemplate().getParameters().getInt("CollectGhostDespawnTime", 30);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumDrill.java
@@ -16,6 +16,7 @@
 */
 package ai.areas.SelMahumTrainingGrounds;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
 import com.l2jmobius.gameserver.enums.ChatType;
@@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.network.NpcStringId;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -149,7 +149,7 @@ public final class SelMahumDrill extends AbstractNpcAI
 			{
 				if ((npc != null) && !npc.isDead())
 				{
-					if (Util.contains(MAHUM_CHIEFS, npc.getId()))
+					if (CommonUtil.contains(MAHUM_CHIEFS, npc.getId()))
 					{
 						if ((npc.getVariables().getInt("BUSY_STATE") == 0) && (npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ACTIVE) && npc.staysInSpawnLoc())
 						{
@@ -164,7 +164,7 @@ public final class SelMahumDrill extends AbstractNpcAI
 						
 						startQuestTimer("do_social_action", 15000, npc, null);
 					}
-					else if (Util.contains(MAHUM_SOLDIERS, npc.getId()))
+					else if (CommonUtil.contains(MAHUM_SOLDIERS, npc.getId()))
 					{
 						handleSocialAction(npc, SOLDIER_SOCIAL_ACTIONS[npc.getVariables().getInt("SOCIAL_ACTION_NEXT_INDEX")], false);
 					}
@@ -211,7 +211,7 @@ public final class SelMahumDrill extends AbstractNpcAI
 				((L2MonsterInstance) ch).addDamageHate(attacker, 0, 1000);
 			}
 		}
-		if ((getRandom(10) < 1) && (Util.contains(MAHUM_SOLDIERS, npc.getId())))
+		if ((getRandom(10) < 1) && (CommonUtil.contains(MAHUM_SOLDIERS, npc.getId())))
 		{
 			npc.broadcastEvent("ATTACKED", 1000, null);
 		}
@@ -227,7 +227,7 @@ public final class SelMahumDrill extends AbstractNpcAI
 			{
 				case "do_social_action":
 				{
-					if (Util.contains(MAHUM_SOLDIERS, receiver.getId()))
+					if (CommonUtil.contains(MAHUM_SOLDIERS, receiver.getId()))
 					{
 						final int actionIndex = sender.getVariables().getInt("SOCIAL_ACTION_NEXT_INDEX");
 						receiver.getVariables().set("SOCIAL_ACTION_NEXT_INDEX", actionIndex);
@@ -237,7 +237,7 @@ public final class SelMahumDrill extends AbstractNpcAI
 				}
 				case "CHIEF_DIED":
 				{
-					if (Util.contains(MAHUM_SOLDIERS, receiver.getId()))
+					if (CommonUtil.contains(MAHUM_SOLDIERS, receiver.getId()))
 					{
 						if (getRandom(4) < 1)
 						{
@@ -257,7 +257,7 @@ public final class SelMahumDrill extends AbstractNpcAI
 				}
 				case "ATTACKED":
 				{
-					if (Util.contains(MAHUM_CHIEFS, receiver.getId()))
+					if (CommonUtil.contains(MAHUM_CHIEFS, receiver.getId()))
 					{
 						receiver.broadcastSay(ChatType.NPC_GENERAL, CHIEF_FSTRINGS[getRandom(2)]);
 					}
@@ -278,12 +278,12 @@ public final class SelMahumDrill extends AbstractNpcAI
 	@Override
 	public String onSpawn(L2Npc npc)
 	{
-		if (Util.contains(MAHUM_CHIEFS, npc.getId()))
+		if (CommonUtil.contains(MAHUM_CHIEFS, npc.getId()))
 		{
 			startQuestTimer("do_social_action", 15000, npc, null);
 		}
 		
-		else if ((getRandom(18) < 1) && Util.contains(MAHUM_SOLDIERS, npc.getId()))
+		else if ((getRandom(18) < 1) && CommonUtil.contains(MAHUM_SOLDIERS, npc.getId()))
 		{
 			npc.getVariables().set("SOCIAL_ACTION_ALT_BEHAVIOR", 1);
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/SelMahumTrainingGrounds/SelMahumSquad.java
@@ -16,6 +16,7 @@
 */
 package ai.areas.SelMahumTrainingGrounds;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.GameTimeController;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
@@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.NpcStringId;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -199,7 +199,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 			startQuestTimer("chef_set_invul", 60000, npc, null);
 			npc.getVariables().set("BUSY_STATE", 1);
 		}
-		else if (Util.contains(SQUAD_LEADERS, npc.getId()))
+		else if (CommonUtil.contains(SQUAD_LEADERS, npc.getId()))
 		{
 			handlePreAttackMotion(npc);
 		}
@@ -232,7 +232,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 			}
 			case "SCE_CAMPFIRE_START":
 			{
-				if (!receiver.isNoRndWalk() && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && Util.contains(SQUAD_LEADERS, receiver.getId()))
+				if (!receiver.isNoRndWalk() && !receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && CommonUtil.contains(SQUAD_LEADERS, receiver.getId()))
 				{
 					receiver.setIsNoRndWalk(true); // Moving to fire - i_ai0 = 1
 					receiver.setRunning();
@@ -251,7 +251,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 				{
 					receiver.deleteMe();
 				}
-				else if ((receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && Util.contains(SQUAD_LEADERS, receiver.getId()))
+				else if ((receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && CommonUtil.contains(SQUAD_LEADERS, receiver.getId()))
 				{
 					receiver.setIsNoRndWalk(false);
 					receiver.getVariables().remove("BUSY_STATE");
@@ -262,7 +262,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 			}
 			case "SCE_DINNER_EAT":
 			{
-				if (!receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (receiver.getVariables().getInt("BUSY_STATE", 0) == 0) && Util.contains(SQUAD_LEADERS, receiver.getId()))
+				if (!receiver.isDead() && (receiver.getAI().getIntention() != CtrlIntention.AI_INTENTION_ATTACK) && (receiver.getVariables().getInt("BUSY_STATE", 0) == 0) && CommonUtil.contains(SQUAD_LEADERS, receiver.getId()))
 				{
 					if (receiver.isNoRndWalk()) // i_ai0 == 1
 					{
@@ -283,7 +283,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 			}
 			case "SCE_SOUP_FAILURE":
 			{
-				if (Util.contains(SQUAD_LEADERS, receiver.getId()))
+				if (CommonUtil.contains(SQUAD_LEADERS, receiver.getId()))
 				{
 					receiver.getVariables().set("FULL_BARREL_REWARDING_PLAYER", reference.getObjectId()); // TODO: Use it in 289 quest
 					startQuestTimer("reset_full_bottle_prize", 180000, receiver, null);
@@ -328,7 +328,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if ((npc.getId() == STOVE) && (skill.getId() == 9075) && Util.contains(targets, npc))
+		if ((npc.getId() == STOVE) && (skill.getId() == 9075) && CommonUtil.contains(targets, npc))
 		{
 			npc.doCast(SkillData.getInstance().getSkill(6688, 1));
 			npc.broadcastEvent("SCE_SOUP_FAILURE", 600, caster);
@@ -347,7 +347,7 @@ public final class SelMahumSquad extends AbstractNpcAI
 		{
 			startQuestTimer("fire", 1000, npc, null);
 		}
-		else if (Util.contains(SQUAD_LEADERS, npc.getId()))
+		else if (CommonUtil.contains(SQUAD_LEADERS, npc.getId()))
 		{
 			npc.setDisplayEffect(3);
 			npc.setIsNoRndWalk(false);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/StakatoNest/StakatoNest.java
@@ -18,6 +18,7 @@ package ai.areas.StakatoNest;

 import java.util.List;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -188,7 +189,7 @@ public final class StakatoNest extends AbstractNpcAI
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if (Util.contains(COCOONS, npc.getId()) && Util.contains(targets, npc) && (skill.getId() == GROWTH_ACCELERATOR))
+		if (CommonUtil.contains(COCOONS, npc.getId()) && CommonUtil.contains(targets, npc) && (skill.getId() == GROWTH_ACCELERATOR))
 		{
 			npc.doDie(caster);
 			final L2Npc spawned = addSpawn(STAKATO_CHIEF, npc.getX(), npc.getY(), npc.getZ(), Util.calculateHeadingFrom(npc, caster), false, 0, true);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/HuntingGroundsTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/HuntingGroundsTeleport/HuntingGroundsTeleport.java
@@ -16,10 +16,10 @@
 */
 package ai.others.HuntingGroundsTeleport;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.SevenSigns;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -59,7 +59,7 @@ public final class HuntingGroundsTeleport extends AbstractNpcAI
 		
 		if (playerCabal == SevenSigns.CABAL_NULL)
 		{
-			return Util.contains(DAWN_NPCS, npc.getId()) ? "dawn_tele-no.htm" : "dusk_tele-no.htm";
+			return CommonUtil.contains(DAWN_NPCS, npc.getId()) ? "dawn_tele-no.htm" : "dusk_tele-no.htm";
 		}
 		
 		String htmltext = "";
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/MonumentOfHeroes/MonumentOfHeroes.java
@@ -16,9 +16,9 @@
 */
 package ai.others.MonumentOfHeroes;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -98,7 +98,7 @@ public final class MonumentOfHeroes extends AbstractNpcAI
 			default:
 			{
 				final int weaponId = Integer.parseInt(event);
-				if (Util.contains(WEAPONS, weaponId))
+				if (CommonUtil.contains(WEAPONS, weaponId))
 				{
 					giveItems(player, weaponId, 1);
 				}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/OracleTeleport/OracleTeleport.java
@@ -16,6 +16,7 @@
 */
 package ai.others.OracleTeleport;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -24,7 +25,6 @@ import com.l2jmobius.gameserver.model.itemcontainer.Inventory;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.model.quest.State;
 import com.l2jmobius.gameserver.network.SystemMessageId;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -160,13 +160,13 @@ public final class OracleTeleport extends AbstractNpcAI
 		final int npcId = npc.getId();
 		if (event.equalsIgnoreCase("Return"))
 		{
-			if (Util.contains(TEMPLE_PRIEST, npcId) && (st.getState() == State.STARTED))
+			if (CommonUtil.contains(TEMPLE_PRIEST, npcId) && (st.getState() == State.STARTED))
 			{
 				player.teleToLocation(RETURN_LOCS[st.getInt("id")]);
 				player.setIsIn7sDungeon(false);
 				st.exitQuest(true);
 			}
-			else if (Util.contains(RIFT_POSTERS, npcId) && (st.getState() == State.STARTED))
+			else if (CommonUtil.contains(RIFT_POSTERS, npcId) && (st.getState() == State.STARTED))
 			{
 				player.teleToLocation(RETURN_LOCS[st.getInt("id")]);
 				htmltext = "rift_back.htm";
@@ -183,12 +183,12 @@ public final class OracleTeleport extends AbstractNpcAI
 		else if (event.equalsIgnoreCase("Festival"))
 		{
 			final int id = st.getInt("id");
-			if (Util.contains(TOWN_DAWN, id))
+			if (CommonUtil.contains(TOWN_DAWN, id))
 			{
 				player.teleToLocation(new Location(-80157, 111344, -4901));
 				player.setIsIn7sDungeon(true);
 			}
-			else if (Util.contains(TOWN_DUSK, id))
+			else if (CommonUtil.contains(TOWN_DUSK, id))
 			{
 				player.teleToLocation(new Location(-81261, 86531, -5157));
 				player.setIsIn7sDungeon(true);
@@ -280,7 +280,7 @@ public final class OracleTeleport extends AbstractNpcAI
 		final QuestState st = getQuestState(player, true);
 		
 		final int npcId = npc.getId();
-		if (Util.contains(TOWN_DAWN, npcId))
+		if (CommonUtil.contains(TOWN_DAWN, npcId))
 		{
 			st.setState(State.STARTED);
 			int i = 0;
@@ -297,7 +297,7 @@ public final class OracleTeleport extends AbstractNpcAI
 			player.teleToLocation(new Location(-80157, 111344, -4901));
 			player.setIsIn7sDungeon(true);
 		}
-		if (Util.contains(TOWN_DUSK, npcId))
+		if (CommonUtil.contains(TOWN_DUSK, npcId))
 		{
 			st.setState(State.STARTED);
 			int i = 0;
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -16,6 +16,7 @@
 */
 package ai.others.TeleportToUndergroundColiseum;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.Location;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -114,7 +115,7 @@ public final class TeleportToUndergroundColiseum extends AbstractNpcAI
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		if (Util.contains(MANAGERS, npc.getId()))
+		if (CommonUtil.contains(MANAGERS, npc.getId()))
 		{
 			player.teleToLocation(RETURN_LOCS[getRandom(RETURN_LOCS.length)], false);
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/VarkaKetra.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/VarkaKetra.java
@@ -16,6 +16,7 @@
 */
 package ai.others;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.L2Attackable;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -149,12 +150,12 @@ public class VarkaKetra extends AbstractNpcAI
 	{
 		if (Util.checkIfInRange(1500, player, npc, false))
 		{
-			if (Util.contains(KETRA, npc.getId()) && hasAtLeastOneQuestItem(player, KETRA_MARKS))
+			if (CommonUtil.contains(KETRA, npc.getId()) && hasAtLeastOneQuestItem(player, KETRA_MARKS))
 			{
 				decreaseAlliance(player, KETRA_MARKS);
 				exitQuests(player, KETRA_QUESTS);
 			}
-			else if (Util.contains(VARKA, npc.getId()) && hasAtLeastOneQuestItem(player, VARKA_MARKS))
+			else if (CommonUtil.contains(VARKA, npc.getId()) && hasAtLeastOneQuestItem(player, VARKA_MARKS))
 			{
 				decreaseAlliance(player, VARKA_MARKS);
 				exitQuests(player, VARKA_QUESTS);
@@ -200,7 +201,7 @@ public class VarkaKetra extends AbstractNpcAI
 	@Override
 	public boolean onNpcHate(L2Attackable mob, L2PcInstance player, boolean isSummon)
 	{
-		if (Util.contains(KETRA, mob.getId()))
+		if (CommonUtil.contains(KETRA, mob.getId()))
 		{
 			return !hasAtLeastOneQuestItem(player, KETRA_MARKS);
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/others/WyvernManager/WyvernManager.java
@@ -20,12 +20,12 @@ import java.util.HashMap;
 import java.util.Map;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.SevenSigns;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Fort;
 import com.l2jmobius.gameserver.model.entity.clanhall.SiegableHall;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;

@@ -106,7 +106,7 @@ public final class WyvernManager extends AbstractNpcAI
 	
 	private String mountWyvern(L2Npc npc, L2PcInstance player)
 	{
-		if (player.isMounted() && (player.getMountLevel() >= STRIDER_LVL) && Util.contains(STRIDERS, player.getMountNpcId()))
+		if (player.isMounted() && (player.getMountLevel() >= STRIDER_LVL) && CommonUtil.contains(STRIDERS, player.getMountNpcId()))
 		{
 			if (isOwnerClan(npc, player) && (getQuestItemsCount(player, CRYSTAL_B_GRADE) >= WYVERN_FEE))
 			{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java
@@ -31,6 +31,7 @@ import java.util.concurrent.ScheduledFuture;
 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.cache.HtmCache;
 import com.l2jmobius.gameserver.data.sql.impl.ClanTable;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
@@ -54,7 +55,6 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
 import com.l2jmobius.gameserver.util.Broadcast;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * Rainbow Springs Chateau clan hall siege script.
@@ -322,7 +322,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine
 				html = "game_manager001.htm";
 			}
 		}
-		else if (Util.contains(YETIS, npcId))
+		else if (CommonUtil.contains(YETIS, npcId))
 		{
 			// TODO: Review.
 			if (_rainbow.isInSiege())
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java
@@ -16,6 +16,7 @@
 */
 package custom.NpcLocationInfo;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.datatables.SpawnTable;
 import com.l2jmobius.gameserver.model.L2Spawn;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -276,7 +277,7 @@ public final class NpcLocationInfo extends AbstractNpcAI
 			htmltext = null;
 			final int npcId = Integer.parseInt(event);
 			
-			if (Util.contains(NPCRADAR, npcId))
+			if (CommonUtil.contains(NPCRADAR, npcId))
 			{
 				int x = 0, y = 0, z = 0;
 				final L2Spawn spawn = SpawnTable.getInstance().getAnySpawn(npcId);
@@ -300,7 +301,7 @@ public final class NpcLocationInfo extends AbstractNpcAI
 		final int npcId = npc.getId();
 		getQuestState(player, true);
 		
-		if (Util.contains(NPC, npcId))
+		if (CommonUtil.contains(NPC, npcId))
 		{
 			htmltext = npcId + ".htm";
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/Validators/SubClassSkills.java
@@ -21,6 +21,7 @@ import java.util.Arrays;
 import java.util.List;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.data.xml.impl.ClassListData;
 import com.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
 import com.l2jmobius.gameserver.model.PcCondOverride;
@@ -180,7 +181,7 @@ public final class SubClassSkills extends AbstractNpcAI
 							}
 							if (skill != null)
 							{
-								if (!Util.contains(_certSkillsByLevel[i], id))
+								if (!CommonUtil.contains(_certSkillsByLevel[i], id))
 								{
 									// should remove this skill ?
 									Util.handleIllegalPlayerAction(player, "Invalid cert variable WITH skill:" + qName + "=" + qValue + " - skill does not match certificate level", IllegalActionPunishmentType.NONE);
@@ -230,7 +231,7 @@ public final class SubClassSkills extends AbstractNpcAI
 							}
 							if (item != null)
 							{
-								if (!Util.contains(_certItemsByLevel[i], item.getId()))
+								if (!CommonUtil.contains(_certItemsByLevel[i], item.getId()))
 								{
 									Util.handleIllegalPlayerAction(player, "Invalid cert variable:" + qName + "=" + qValue + " - item found but does not match certificate level", IllegalActionPunishmentType.NONE);
 								}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java
@@ -22,6 +22,7 @@ import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -29,7 +30,6 @@ import com.l2jmobius.gameserver.model.holders.SkillHolder;
 import com.l2jmobius.gameserver.model.quest.Event;
 import com.l2jmobius.gameserver.model.skills.Skill;
 import com.l2jmobius.gameserver.util.Broadcast;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * Rabbits event.<br>
@@ -202,7 +202,7 @@ public final class Rabbits extends Event
 	{
 		if (skill.getId() == RABBIT_TORNADO.getSkillId())
 		{
-			if (!npc.isInvisible() && Util.contains(targets, npc))
+			if (!npc.isInvisible() && CommonUtil.contains(targets, npc))
 			{
 				dropItem(npc, caster, DROPLIST);
 				npc.deleteMe();
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java
@@ -16,6 +16,7 @@
 */
 package events.FreyaCelebration;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.model.L2Object;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -27,7 +28,6 @@ import com.l2jmobius.gameserver.network.NpcStringId;
 import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.CreatureSay;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * Freya Celebration event AI.
@@ -119,7 +119,7 @@ public final class FreyaCelebration extends LongTimeEvent
 			return null;
 		}
 		
-		if ((npc.getId() == FREYA) && Util.contains(targets, npc) && Util.contains(SKILLS, skill.getId()))
+		if ((npc.getId() == FREYA) && CommonUtil.contains(targets, npc) && CommonUtil.contains(SKILLS, skill.getId()))
 		{
 			if (getRandom(100) < 5)
 			{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/CastleDungeon/CastleDungeon.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.instancemanager.FortManager;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.L2Party;
@@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.entity.Castle;
 import com.l2jmobius.gameserver.model.entity.Fort;
 import com.l2jmobius.gameserver.model.instancezone.InstanceWorld;
-import com.l2jmobius.gameserver.util.Util;

 import instances.AbstractInstance;

@@ -145,7 +145,7 @@ public final class CastleDungeon extends AbstractInstance
 		InstanceWorld world = InstanceManager.getInstance().getWorld(npc);
 		if (world != null)
 		{
-			if (Util.contains(RAIDS3, npc.getId()))
+			if (CommonUtil.contains(RAIDS3, npc.getId()))
 			{
 				finishInstance(world);
 			}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -686,7 +686,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm
 		{
 			((L2Attackable) npc).setSeeThroughSilentMove(true);
 		}
-		if (Util.contains(AI_DISABLED_MOBS, npcId))
+		if (CommonUtil.contains(AI_DISABLED_MOBS, npcId))
 		{
 			npc.disableCoreAI(true);
 		}
@@ -1454,7 +1454,7 @@ public final class FinalEmperialTomb extends AbstractInstance implements IGameXm
 			if (skill != null)
 			{
 				// When Dewdrop of Destruction is used on Portraits they suicide.
-				if (Util.contains(PORTRAITS, npc.getId()) && (skill.getId() == DEWDROP_OF_DESTRUCTION_SKILL_ID))
+				if (CommonUtil.contains(PORTRAITS, npc.getId()) && (skill.getId() == DEWDROP_OF_DESTRUCTION_SKILL_ID))
 				{
 					npc.doDie(caster);
 				}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java
@@ -16,6 +16,7 @@
 */
 package instances.NornilsGarden;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.data.xml.impl.SkillData;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.L2Party;
@@ -516,7 +517,7 @@ public final class NornilsGarden extends AbstractInstance
 			{
 			}
 		}
-		else if (Util.contains(_final_gates, npc.getId()))
+		else if (CommonUtil.contains(_final_gates, npc.getId()))
 		{
 			if (event.equalsIgnoreCase("32260-02.html") || event.equalsIgnoreCase("32261-02.html") || event.equalsIgnoreCase("32262-02.html"))
 			{
@@ -556,7 +557,7 @@ public final class NornilsGarden extends AbstractInstance
 	@Override
 	public final String onTalk(L2Npc npc, L2PcInstance player)
 	{
-		if (Util.contains(_final_gates, npc.getId()))
+		if (CommonUtil.contains(_final_gates, npc.getId()))
 		{
 			final QuestState cst = player.getQuestState(Q00179_IntoTheLargeCavern.class.getSimpleName());
 			if ((cst != null) && (cst.getState() == State.STARTED))
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
@@ -16,13 +16,13 @@
 */
 package quests.Q00246_PossessorOfAPreciousSoul3;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.model.quest.State;
-import com.l2jmobius.gameserver.util.Util;

 import quests.Q00242_PossessorOfAPreciousSoul2.Q00242_PossessorOfAPreciousSoul2;

@@ -228,7 +228,7 @@ public class Q00246_PossessorOfAPreciousSoul3 extends Quest
 					return super.onKill(npc, player, isSummon);
 				}
 				
-				if (Util.contains(MOBS, npc.getId()) && (getQuestItemsCount(player, FRAGMENTS) < 100) && (st.isCond(4)))
+				if (CommonUtil.contains(MOBS, npc.getId()) && (getQuestItemsCount(player, FRAGMENTS) < 100) && (st.isCond(4)))
 				{
 					if (getRandom(100) < CHANCE_FOR_DROP_FRAGMENTS)
 					{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00251_NoSecrets/Q00251_NoSecrets.java
@@ -16,13 +16,13 @@
 */
 package quests.Q00251_NoSecrets;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.model.quest.State;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * No Secrets (251)
@@ -84,7 +84,7 @@ public class Q00251_NoSecrets extends Quest
 		{
 			final int npcId = npc.getId();
 			
-			if (Util.contains(MOBS, npcId) && (getRandom(100) < 10) && (getQuestItemsCount(player, DIARY) < 10))
+			if (CommonUtil.contains(MOBS, npcId) && (getRandom(100) < 10) && (getQuestItemsCount(player, DIARY) < 10))
 			{
 				giveItems(player, DIARY, 1);
 				if ((getQuestItemsCount(player, DIARY) >= 10) && (getQuestItemsCount(player, TABLE) >= 5))
@@ -96,7 +96,7 @@ public class Q00251_NoSecrets extends Quest
 					playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 				}
 			}
-			else if (Util.contains(MOBS2, npcId) && (getRandom(100) < 5) && (getQuestItemsCount(player, TABLE) < 5))
+			else if (CommonUtil.contains(MOBS2, npcId) && (getRandom(100) < 5) && (getQuestItemsCount(player, TABLE) < 5))
 			{
 				giveItems(player, TABLE, 1);
 				if ((getQuestItemsCount(player, DIARY) >= 10) && (getQuestItemsCount(player, TABLE) >= 5))
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
@@ -16,13 +16,13 @@
 */
 package quests.Q00289_NoMoreSoupForYou;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.model.quest.State;
-import com.l2jmobius.gameserver.util.Util;

 import quests.Q00252_ItSmellsDelicious.Q00252_ItSmellsDelicious;

@@ -223,7 +223,7 @@ public class Q00289_NoMoreSoupForYou extends Quest
 		{
 			return null;
 		}
-		if (Util.contains(MOBS, npcId))
+		if (CommonUtil.contains(MOBS, npcId))
 		{
 			giveItems(player, SOUP, 1 * RATE);
 			playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00308_ReedFieldMaintenance/Q00308_ReedFieldMaintenance.java
@@ -20,13 +20,13 @@ import java.util.HashMap;
 import java.util.Map;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.network.serverpackets.RadarControl;
-import com.l2jmobius.gameserver.util.Util;

 import quests.Q00238_SuccessFailureOfBusiness.Q00238_SuccessFailureOfBusiness;
 import quests.Q00309_ForAGoodCause.Q00309_ForAGoodCause;
@@ -211,7 +211,7 @@ public class Q00308_ReedFieldMaintenance extends Quest
 		String htmltext;
 		if (canGiveItem(player, quanty))
 		{
-			if (Util.contains(MOIRAI_PIECES, item))
+			if (CommonUtil.contains(MOIRAI_PIECES, item))
 			{
 				giveItems(player, item, getRandom(1, 4));
 			}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00309_ForAGoodCause/Q00309_ForAGoodCause.java
@@ -20,13 +20,13 @@ import java.util.HashMap;
 import java.util.Map;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.network.serverpackets.RadarControl;
-import com.l2jmobius.gameserver.util.Util;

 import quests.Q00239_WontYouJoinUs.Q00239_WontYouJoinUs;
 import quests.Q00308_ReedFieldMaintenance.Q00308_ReedFieldMaintenance;
@@ -213,7 +213,7 @@ public class Q00309_ForAGoodCause extends Quest
 		String htmltext;
 		if (canGiveItem(player, quanty))
 		{
-			if (Util.contains(MOIRAI_PIECES, item))
+			if (CommonUtil.contains(MOIRAI_PIECES, item))
 			{
 				giveItems(player, item, getRandom(1, 4));
 			}
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java
@@ -16,6 +16,7 @@
 */
 package quests.Q00453_NotStrongEnoughAlone;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.enums.QuestType;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -121,7 +122,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 		{
 			final ExQuestNpcLogList log = new ExQuestNpcLogList(getId());
 			
-			if (Util.contains(MONSTER1, npcId) && qs.isCond(2))
+			if (CommonUtil.contains(MONSTER1, npcId) && qs.isCond(2))
 			{
 				if (npcId == MONSTER1[4])
 				{
@@ -154,7 +155,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 				log.addNpc(MONSTER1[2], qs.getInt(String.valueOf(MONSTER1[2])));
 				log.addNpc(MONSTER1[3], qs.getInt(String.valueOf(MONSTER1[3])));
 			}
-			else if (Util.contains(MONSTER2, npcId) && qs.isCond(3))
+			else if (CommonUtil.contains(MONSTER2, npcId) && qs.isCond(3))
 			{
 				if (npcId == MONSTER2[3])
 				{
@@ -182,7 +183,7 @@ public class Q00453_NotStrongEnoughAlone extends Quest
 				log.addNpc(MONSTER2[1], qs.getInt(String.valueOf(MONSTER2[1])));
 				log.addNpc(MONSTER2[2], qs.getInt(String.valueOf(MONSTER2[2])));
 			}
-			else if (Util.contains(MONSTER3, npcId) && qs.isCond(4))
+			else if (CommonUtil.contains(MONSTER3, npcId) && qs.isCond(4))
 			{
 				if (npcId == MONSTER3[3])
 				{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java
@@ -21,6 +21,7 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.enums.QuestSound;
@@ -185,7 +186,7 @@ public final class Q00456_DontKnowDontCare extends Quest
 		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
 		
-		if (Util.contains(SEPARATED_SOUL, npc.getId()))
+		if (CommonUtil.contains(SEPARATED_SOUL, npc.getId()))
 		{
 			switch (qs.getState())
 			{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java
@@ -20,6 +20,7 @@ import java.util.HashMap;
 import java.util.Map;

 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.instancemanager.InstanceManager;
 import com.l2jmobius.gameserver.model.L2Party;
@@ -375,7 +376,7 @@ public final class Q00511_AwlUnderFoot extends Quest
 		if (tmpworld instanceof FAUWorld)
 		{
 			final FAUWorld world = (FAUWorld) tmpworld;
-			if (Util.contains(RAIDS3, npc.getId()))
+			if (CommonUtil.contains(RAIDS3, npc.getId()))
 			{
 				if (player.getParty() != null)
 				{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
@@ -19,11 +19,11 @@ package quests.Q00619_RelicsOfTheOldEmpire;
 import java.util.HashMap;
 import java.util.Map;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * Relics of the Old Empire (619)
@@ -271,7 +271,7 @@ public final class Q00619_RelicsOfTheOldEmpire extends Quest
 		if (st != null)
 		{
 			final int npcId = npc.getId();
-			if (Util.contains(ARCHON_OF_HALISHA, npcId))
+			if (CommonUtil.contains(ARCHON_OF_HALISHA, npcId))
 			{
 				final int itemCount = ((getRandom(100) < 79) ? 4 : 3);
 				giveItemRandomly(player, npc, BROKEN_RELIC_PART, itemCount, 0, 1.0, true);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00643_RiseAndFallOfTheElrokiTribe/Q00643_RiseAndFallOfTheElrokiTribe.java
@@ -17,13 +17,13 @@
 package quests.Q00643_RiseAndFallOfTheElrokiTribe;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.QuestSound;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.model.quest.State;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * Rise and Fall of the Elroki Tribe (643)
@@ -190,7 +190,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 		
 		final int npcId = npc.getId();
 		
-		if (Util.contains(MOBS1, npcId))
+		if (CommonUtil.contains(MOBS1, npcId))
 		{
 			final float chance = CHANCE_MOBS1 * Config.RATE_QUEST_DROP;
 			if (getRandom(1000) < chance)
@@ -204,7 +204,7 @@ public class Q00643_RiseAndFallOfTheElrokiTribe extends Quest
 			playSound(partyMember, QuestSound.ITEMSOUND_QUEST_ITEMGET);
 		}
 		
-		if (Util.contains(MOBS2, npcId) && (getRandom(1000) < (CHANCE_MOBS2 * Config.RATE_QUEST_DROP)))
+		if (CommonUtil.contains(MOBS2, npcId) && (getRandom(1000) < (CHANCE_MOBS2 * Config.RATE_QUEST_DROP)))
 		{
 			rewardItems(partyMember, BONES_OF_A_PLAINS_DINOSAUR, 1);
 			playSound(partyMember, QuestSound.ITEMSOUND_QUEST_ITEMGET);
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00709_PathToBecomingALordDion/Q00709_PathToBecomingALordDion.java
@@ -16,6 +16,7 @@
 */
 package quests.Q00709_PathToBecomingALordDion;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.CastleManager;
@@ -30,7 +31,6 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
 import com.l2jmobius.gameserver.model.quest.State;
 import com.l2jmobius.gameserver.network.NpcStringId;
 import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
-import com.l2jmobius.gameserver.util.Util;

 public class Q00709_PathToBecomingALordDion extends Quest
 {
@@ -277,7 +277,7 @@ public class Q00709_PathToBecomingALordDion extends Quest
 	{
 		final QuestState qs = killer.getQuestState(getName());
 		
-		if ((qs != null) && qs.isCond(6) && Util.contains(OlMahums, npc.getId()))
+		if ((qs != null) && qs.isCond(6) && CommonUtil.contains(OlMahums, npc.getId()))
 		{
 			if ((npc.getId() != BloodyAxeAide) && (Rnd.get(9) == 0))
 			{
@@ -289,7 +289,7 @@ public class Q00709_PathToBecomingALordDion extends Quest
 				qs.setCond(7);
 			}
 		}
-		if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(0) && isLordAvailable(8, qs) && Util.contains(Manragoras, npc.getId()))
+		if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(0) && isLordAvailable(8, qs) && CommonUtil.contains(Manragoras, npc.getId()))
 		{
 			if (getQuestItemsCount(killer, MandragoraRoot) < 100)
 			{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00727_HopeWithinTheDarkness/Q00727_HopeWithinTheDarkness.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.Map;

 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.enums.ChatType;
 import com.l2jmobius.gameserver.instancemanager.FortManager;
@@ -447,12 +448,12 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 		if (tmpworld instanceof CAUWorld)
 		{
 			final CAUWorld world = (CAUWorld) tmpworld;
-			if (Util.contains(BOSSES, npc.getId()))
+			if (CommonUtil.contains(BOSSES, npc.getId()))
 			{
 				npc.broadcastPacket(new NpcSay(npc.getObjectId(), ChatType.NPC_GENERAL, npc.getId(), STRINGID_BOSS_DEATH));
 			}
 			
-			if ((tmpworld.getStatus() == 3) && (Util.contains(BOSSES, npc.getId()) || Util.contains(MONSTERS, npc.getId())))
+			if ((tmpworld.getStatus() == 3) && (CommonUtil.contains(BOSSES, npc.getId()) || CommonUtil.contains(MONSTERS, npc.getId())))
 			{
 				world.allMonstersDead = true;
 				final Instance inst = InstanceManager.getInstance().getInstance(tmpworld.getInstanceId());
@@ -461,7 +462,7 @@ public class Q00727_HopeWithinTheDarkness extends Quest
 				{
 					for (L2Npc _npc : inst.getNpcs())
 					{
-						if ((_npc != null) && !_npc.isDead() && (Util.contains(BOSSES, _npc.getId()) || Util.contains(MONSTERS, _npc.getId())))
+						if ((_npc != null) && !_npc.isDead() && (CommonUtil.contains(BOSSES, _npc.getId()) || CommonUtil.contains(MONSTERS, _npc.getId())))
 						{
 							world.allMonstersDead = false;
 							break;
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java
@@ -16,12 +16,12 @@
 */
 package quests.Q10292_SevenSignsGirlOfDoubt;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.holders.ItemHolder;
 import com.l2jmobius.gameserver.model.quest.Quest;
 import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.util.Util;

 import quests.Q00198_SevenSignsEmbryo.Q00198_SevenSignsEmbryo;

@@ -199,7 +199,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
 		final QuestState st = getRandomPartyMemberState(player, -1, 3, npc);
 		if (st != null)
 		{
-			if (Util.contains(MOBS, npc.getId()))
+			if (CommonUtil.contains(MOBS, npc.getId()))
 			{
 				if (giveItemRandomly(st.getPlayer(), npc, ELCADIAS_MARK.getId(), 1, ELCADIAS_MARK.getCount(), 0.7, true) && st.isMemoState(3))
 				{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/TerritoryWarScripts/TerritoryWarSuperClass.java
@@ -18,6 +18,7 @@ package quests.TerritoryWarScripts;

 import java.util.Calendar;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.instancemanager.CastleManager;
 import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager;
 import com.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
@@ -177,7 +178,7 @@ public class TerritoryWarSuperClass extends Quest
 	@Override
 	public String onAttack(L2Npc npc, L2PcInstance player, int damage, boolean isSummon)
 	{
-		if ((npc.getCurrentHp() == npc.getMaxHp()) && Util.contains(NPC_IDS, npc.getId()))
+		if ((npc.getCurrentHp() == npc.getMaxHp()) && CommonUtil.contains(NPC_IDS, npc.getId()))
 		{
 			final int territoryId = getTerritoryIdForThisNPCId(npc.getId());
 			if ((territoryId >= 81) && (territoryId <= 89))
@@ -289,7 +290,7 @@ public class TerritoryWarSuperClass extends Quest
 			manager.announceToParticipants(new ExShowScreenMessage(npcString[0], 2, 10000), 135000, 13500);
 			handleBecomeMercenaryQuest(killer, true);
 		}
-		else if (Util.contains(LEADER_IDS, npc.getId()))
+		else if (CommonUtil.contains(LEADER_IDS, npc.getId()))
 		{
 			manager.giveTWPoint(killer, TERRITORY_ID, 3);
 		}
@@ -304,7 +305,7 @@ public class TerritoryWarSuperClass extends Quest
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if (Util.contains(targets, npc))
+		if (CommonUtil.contains(targets, npc))
 		{
 			if (skill.getId() == 845)
 			{
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/village_master/KamaelChange2/KamaelChange2.java
@@ -16,6 +16,7 @@
 */
 package village_master.KamaelChange2;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.data.xml.impl.CategoryData;
 import com.l2jmobius.gameserver.enums.CategoryType;
 import com.l2jmobius.gameserver.enums.Race;
@@ -23,7 +24,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jmobius.gameserver.model.base.ClassId;
 import com.l2jmobius.gameserver.model.quest.QuestState;
-import com.l2jmobius.gameserver.util.Util;

 import ai.AbstractNpcAI;
 import quests.Q00064_CertifiedBerserker.Q00064_CertifiedBerserker;
@@ -115,7 +115,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 		{
 			if (player.isInCategory(CategoryType.KAMAEL_FIRST_CLASS_GROUP))
 			{
-				if (Util.contains(NPCS_MALE, npc.getId()))
+				if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 				{
 					htmltext = "32145-02.htm"; // master_all_kamael012b
 				}
@@ -126,7 +126,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 			}
 			else if (player.isInCategory(CategoryType.KAMAEL_THIRD_CLASS_GROUP))
 			{
-				if (Util.contains(NPCS_MALE, npc.getId()))
+				if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 				{
 					htmltext = "32145-16.htm"; // master_all_kamael005b
 				}
@@ -137,7 +137,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 			}
 			else if (player.isInCategory(CategoryType.KAMAEL_FOURTH_CLASS_GROUP))
 			{
-				if (Util.contains(NPCS_MALE, npc.getId()))
+				if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 				{
 					htmltext = "32145-18.htm"; // master_all_kamael100b
 				}
@@ -148,7 +148,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 			}
 			else if (player.getClassId() == ClassId.TROOPER)
 			{
-				if (Util.contains(NPCS_MALE, npc.getId()))
+				if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 				{
 					if (classId == 127)
 					{
@@ -216,7 +216,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 			}
 			else if (player.getClassId() == ClassId.WARDER)
 			{
-				if (Util.contains(NPCS_MALE, npc.getId()))
+				if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 				{
 					htmltext = "32145-04.htm"; // master_all_kamael002b
 				}
@@ -307,7 +307,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 		}
 		else if (player.isInCategory(CategoryType.KAMAEL_SECOND_CLASS_GROUP))
 		{
-			if (Util.contains(NPCS_MALE, npc.getId()))
+			if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 			{
 				if (player.isInCategory(CategoryType.KAMAEL_FEMALE_MAIN_OCCUPATION))
 				{
@@ -344,7 +344,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 		}
 		else if (player.isInCategory(CategoryType.KAMAEL_THIRD_CLASS_GROUP))
 		{
-			if (Util.contains(NPCS_MALE, npc.getId()))
+			if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 			{
 				if (player.isInCategory(CategoryType.KAMAEL_MALE_MAIN_OCCUPATION))
 				{
@@ -369,7 +369,7 @@ public final class KamaelChange2 extends AbstractNpcAI
 		}
 		else if (player.isInCategory(CategoryType.KAMAEL_FOURTH_CLASS_GROUP))
 		{
-			if (Util.contains(NPCS_MALE, npc.getId()))
+			if (CommonUtil.contains(NPCS_MALE, npc.getId()))
 			{
 				if (player.isInCategory(CategoryType.KAMAEL_MALE_MAIN_OCCUPATION))
 				{
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -226,7 +226,7 @@ public final class CommonUtil
 	{
 		for (T element : array)
 		{
-			if (element == obj)
+			if (element.equals(obj))
 			{
 				return true;
 			}
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/data/xml/impl/NpcData.java
@@ -34,6 +34,7 @@ import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.IGameXmlReader;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.AISkillScope;
@@ -740,7 +741,7 @@ public class NpcData implements IGameXmlReader
 	 */
 	public List<L2NpcTemplate> getAllOfLevel(int... lvls)
 	{
-		return getTemplates(template -> Util.contains(lvls, template.getLevel()));
+		return getTemplates(template -> CommonUtil.contains(lvls, template.getLevel()));
 	}
 	
 	/**
@@ -750,7 +751,7 @@ public class NpcData implements IGameXmlReader
 	 */
 	public List<L2NpcTemplate> getAllMonstersOfLevel(int... lvls)
 	{
-		return getTemplates(template -> Util.contains(lvls, template.getLevel()) && template.isType("L2Monster"));
+		return getTemplates(template -> CommonUtil.contains(lvls, template.getLevel()) && template.isType("L2Monster"));
 	}
 	
 	/**
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
@@ -37,6 +37,7 @@ import java.util.logging.Logger;

 import com.l2jmobius.Config;
 import com.l2jmobius.commons.concurrent.ThreadPool;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.EmptyQueue;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.GameTimeController;
@@ -5781,7 +5782,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
 						
 						if (player.hasSummon())
 						{
-							if ((targets.length == 1) && Util.contains(targets, player.getSummon()))
+							if ((targets.length == 1) && CommonUtil.contains(targets, player.getSummon()))
 							{
 								skillEffectPoint = 0;
 							}
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
@@ -17,6 +17,7 @@
 package com.l2jmobius.gameserver.model.actor;

 import com.l2jmobius.Config;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.commons.util.Rnd;
 import com.l2jmobius.gameserver.ai.CtrlIntention;
 import com.l2jmobius.gameserver.ai.L2CharacterAI;
@@ -69,7 +70,6 @@ import com.l2jmobius.gameserver.network.serverpackets.RelationChanged;
 import com.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import com.l2jmobius.gameserver.network.serverpackets.TeleportToLocation;
 import com.l2jmobius.gameserver.taskmanager.DecayTaskManager;
-import com.l2jmobius.gameserver.util.Util;

 public abstract class L2Summon extends L2Playable
 {
@@ -979,7 +979,7 @@ public abstract class L2Summon extends L2Playable
 		
 		// Sin eater, Big Boom, Wyvern can't attack with attack button.
 		final int npcId = getId();
-		if (Util.contains(PASSIVE_SUMMONS, npcId))
+		if (CommonUtil.contains(PASSIVE_SUMMONS, npcId))
 		{
 			getOwner().sendPacket(ActionFailed.STATIC_PACKET);
 			return false;
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerRace.java
@@ -16,11 +16,11 @@
 */
 package com.l2jmobius.gameserver.model.conditions;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.enums.Race;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * The Class ConditionPlayerRace.
@@ -42,6 +42,6 @@ public class ConditionPlayerRace extends Condition
 	@Override
 	public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
 	{
-		return (effector != null) && effector.isPlayer() && Util.contains(_races, effector.getActingPlayer().getRace());
+		return (effector != null) && effector.isPlayer() && CommonUtil.contains(_races, effector.getActingPlayer().getRace());
 	}
 }
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerRangeFromNpc.java
@@ -16,12 +16,12 @@
 */
 package com.l2jmobius.gameserver.model.conditions;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.L2World;
 import com.l2jmobius.gameserver.model.actor.L2Character;
 import com.l2jmobius.gameserver.model.actor.L2Npc;
 import com.l2jmobius.gameserver.model.items.L2Item;
 import com.l2jmobius.gameserver.model.skills.Skill;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * Exist NPC condition.
@@ -51,7 +51,7 @@ public class ConditionPlayerRangeFromNpc extends Condition
 		{
 			for (L2Npc target : L2World.getInstance().getVisibleObjects(effector, L2Npc.class, _radius))
 			{
-				if (Util.contains(_npcIds, target.getId()))
+				if (CommonUtil.contains(_npcIds, target.getId()))
 				{
 					existNpc = true;
 					break;
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/EventType.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/EventType.java
@@ -16,6 +16,7 @@
 */
 package com.l2jmobius.gameserver.model.events;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.model.events.impl.IBaseEvent;
 import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttack;
 import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid;
@@ -103,7 +104,6 @@ import com.l2jmobius.gameserver.model.events.impl.sieges.fort.OnFortSiegeFinish;
 import com.l2jmobius.gameserver.model.events.impl.sieges.fort.OnFortSiegeStart;
 import com.l2jmobius.gameserver.model.events.returns.ChatFilterReturn;
 import com.l2jmobius.gameserver.model.events.returns.TerminateReturn;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * @author UnAfraid
@@ -251,6 +251,6 @@ public enum EventType
 	
 	public boolean isReturnClass(Class<?> clazz)
 	{
-		return Util.contains(_returnClass, clazz);
+		return CommonUtil.contains(_returnClass, clazz);
 	}
 }
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/itemcontainer/PcInventory.java
@@ -26,6 +26,7 @@ import java.util.logging.Logger;

 import com.l2jmobius.Config;
 import com.l2jmobius.commons.database.DatabaseFactory;
+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.enums.ItemLocation;
 import com.l2jmobius.gameserver.model.TradeItem;
@@ -42,7 +43,6 @@ import com.l2jmobius.gameserver.network.SystemMessageId;
 import com.l2jmobius.gameserver.network.serverpackets.InventoryUpdate;
 import com.l2jmobius.gameserver.network.serverpackets.ItemList;
 import com.l2jmobius.gameserver.network.serverpackets.StatusUpdate;
-import com.l2jmobius.gameserver.util.Util;

 public class PcInventory extends Inventory
 {
@@ -933,7 +933,7 @@ public class PcInventory extends Inventory
 	 */
 	public boolean canManipulateWithItemId(int itemId)
 	{
-		return ((_blockMode != 0) || !Util.contains(_blockItems, itemId)) && ((_blockMode != 1) || Util.contains(_blockItems, itemId));
+		return ((_blockMode != 0) || !CommonUtil.contains(_blockItems, itemId)) && ((_blockMode != 1) || CommonUtil.contains(_blockItems, itemId));
 	}
 	
 	@Override
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
@@ -18,6 +18,7 @@ package com.l2jmobius.gameserver.model.items.enchant;

 import java.util.logging.Logger;

+import com.l2jmobius.commons.util.CommonUtil;
 import com.l2jmobius.gameserver.datatables.ItemTable;
 import com.l2jmobius.gameserver.model.StatsSet;
 import com.l2jmobius.gameserver.model.items.L2Item;
@@ -25,7 +26,6 @@ import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
 import com.l2jmobius.gameserver.model.items.type.CrystalType;
 import com.l2jmobius.gameserver.model.items.type.EtcItemType;
 import com.l2jmobius.gameserver.model.items.type.ItemType;
-import com.l2jmobius.gameserver.util.Util;

 /**
 * @author UnAfraid
@@ -58,7 +58,7 @@ public abstract class AbstractEnchantItem
 		{
 			throw new NullPointerException();
 		}
-		else if (!Util.contains(ENCHANT_TYPES, getItem().getItemType()))
+		else if (!CommonUtil.contains(ENCHANT_TYPES, getItem().getItemType()))
 		{
 			throw new IllegalAccessError();
 		}
--- a/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java
+++ b/L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/util/Util.java
@@ -499,41 +499,6 @@ public final class Util
 		return date == null ? null : (new SimpleDateFormat(format)).format(date);
 	}
 	
-	/**
-	 * @param <T>
-	 * @param array - the array to look into
-	 * @param obj - the object to search for
-	 * @return {@code true} if the {@code array} contains the {@code obj}, {@code false} otherwise.
-	 */
-	public static <T> boolean contains(T[] array, T obj)
-	{
-		for (T element : array)
-		{
-			if (element == obj)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	/**
-	 * @param array - the array to look into
-	 * @param obj - the integer to search for
-	 * @return {@code true} if the {@code array} contains the {@code obj}, {@code false} otherwise
-	 */
-	public static boolean contains(int[] array, int obj)
-	{
-		for (int element : array)
-		{
-			if (element == obj)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
-	
 	public static File[] getDatapackFiles(String dirname, String extention)
 	{
 		final File dir = new File(Config.DATAPACK_ROOT, "data/" + dirname);
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -458,7 +458,7 @@ public final class CommonUtil
 	{
 		for (T element : array)
 		{
-			if (element == obj)
+			if (element.equals(obj))
 			{
 				return true;
 			}
--- a/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/CommonUtil.java
+++ b/L2J_Mobius_Classic_2.0_Zaken/java/com/l2jmobius/commons/util/CommonUtil.java
@@ -458,7 +458,7 @@ public final class CommonUtil
 	{
 		for (T element : array)
 		{
-			if (element == obj)
+			if (element.equals(obj))
 			{
 				return true;
 			}