diff --git a/src/main/java/com/l2jserver/datapack/ai/fantasy_isle/MC_Show.java b/src/main/java/com/l2jserver/datapack/ai/fantasy_isle/MC_Show.java
index f1790b4b3c3e2b6efafdbcdd779a8bc59dddad59..5b9ca291a3c139d303dd048f54675afe57f2e110 100644
--- a/src/main/java/com/l2jserver/datapack/ai/fantasy_isle/MC_Show.java
+++ b/src/main/java/com/l2jserver/datapack/ai/fantasy_isle/MC_Show.java
@@ -22,6 +22,7 @@ import java.text.SimpleDateFormat;
import java.util.HashMap;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -34,8 +35,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* MC Show AI.
* @author Kerberos
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/AltarsOfSacrifice.java b/src/main/java/com/l2jserver/datapack/ai/group_template/AltarsOfSacrifice.java
index e64a0d67b34558dd9bce6acf35986a11a0712722..cf9bc7c13cbf9bb41e92c8691b91cbae3597c7d8 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/AltarsOfSacrifice.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/AltarsOfSacrifice.java
@@ -21,17 +21,19 @@ package com.l2jserver.datapack.ai.group_template;
import java.util.logging.Level;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.interfaces.ILocational;
-import com.l2jserver.util.Rnd;
/**
- * @author HorridoJoho, janiko, FinalDestination, lion
+ * Altars Of Sacrifice AI.
+ * @author HorridoJoho
+ * @author janiko
+ * @author FinalDestination
+ * @author lion
*/
public final class AltarsOfSacrifice extends AbstractNpcAI
{
@@ -55,12 +57,12 @@ public final class AltarsOfSacrifice extends AbstractNpcAI
throw new IllegalStateException();
}
- final L2Spawn spawn = new L2Spawn(_bossNpcIds[Rnd.get(_bossNpcIds.length)]);
+ final L2Spawn spawn = new L2Spawn(_bossNpcIds[getRandom(_bossNpcIds.length)]);
spawn.setAmount(1);
- spawn.setHeading(Rnd.get(65536));
+ spawn.setHeading(getRandom(65536));
- int radius = Rnd.get(BOSS_MIN_SPAWN_RADIUS, BOSS_MAX_SPAWN_RADIUS);
- double angleRadians = Rnd.get() * 2 * Math.PI;
+ int radius = getRandom(BOSS_MIN_SPAWN_RADIUS, BOSS_MAX_SPAWN_RADIUS);
+ double angleRadians = getRandom() * 2 * Math.PI;
int spawnX = (int) (radius * Math.cos(angleRadians)) + _middlePoint.getX();
int spawnY = (int) (radius * Math.sin(angleRadians)) + _middlePoint.getY();
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/DenOfEvil.java b/src/main/java/com/l2jserver/datapack/ai/group_template/DenOfEvil.java
index 6546d24d9c0b8c8cfc8b6a38734d545939f6845b..3e220f3156359d3e19792a756916bc9ea79f0627 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/DenOfEvil.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/DenOfEvil.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.Location;
@@ -30,8 +31,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Dummy AI for spawns/respawns only for testing.
* @author Gnacik
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/DragonValley.java b/src/main/java/com/l2jserver/datapack/ai/group_template/DragonValley.java
index a65c8c34cce3932c3a84a3ba6cc628e065594637..22e5a299d728ffcbc07a15d80714acd30df9dc52 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/DragonValley.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/DragonValley.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.ai.group_template;
import java.util.EnumMap;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -28,8 +29,6 @@ import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Dragon Valley AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/FairyTrees.java b/src/main/java/com/l2jserver/datapack/ai/group_template/FairyTrees.java
index c2f2ceae70df23cdd8343fa2d92a71f59c800e3a..5e8534519e8fc2ad5e3eb7f141956f98b5c68e09 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/FairyTrees.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/FairyTrees.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Fairy Trees AI.
* @author Charus
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/FeedableBeasts.java b/src/main/java/com/l2jserver/datapack/ai/group_template/FeedableBeasts.java
index 758eda52c10b5b48e079eee4ba18cd5ef3d77a2c..dc549087418fdb02a3a1bdc831350a8b28f5c828 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/FeedableBeasts.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/FeedableBeasts.java
@@ -22,6 +22,9 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
+import com.l2jserver.datapack.quests.Q00655_AGrandPlanForTamingWildBeasts.Q00655_AGrandPlanForTamingWildBeasts;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -33,10 +36,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove;
-import com.l2jserver.datapack.quests.Q00655_AGrandPlanForTamingWildBeasts.Q00655_AGrandPlanForTamingWildBeasts;
-
/**
* Growth-capable mobs: Polymorphing upon successful feeding.
* @author Fulminus
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/FleeMonsters.java b/src/main/java/com/l2jserver/datapack/ai/group_template/FleeMonsters.java
index 51b67abfda361f854e7e6cddcb623959fcbed42f..522cd94f888edae1caa991af523f137e2a47b5bb 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/FleeMonsters.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/FleeMonsters.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.Location;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/FrozenLabyrinth.java b/src/main/java/com/l2jserver/datapack/ai/group_template/FrozenLabyrinth.java
index 3f3c33a2a2da382c34ea095fe9b8a12044685793..b04344e100c336e03052b8c4e2db11acfa15dd2e 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/FrozenLabyrinth.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/FrozenLabyrinth.java
@@ -18,12 +18,11 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Frozen Labyrinth AI.
* @author malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/GiantsCave.java b/src/main/java/com/l2jserver/datapack/ai/group_template/GiantsCave.java
index d2fe3a5f6553cb1e26fce1a6ff403f17b6d4a027..45d190b889429bc19d7b0ba104978c9da092e1c4 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/GiantsCave.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/GiantsCave.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Giant's Cave AI.
* @author Gnacik, St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/HotSprings.java b/src/main/java/com/l2jserver/datapack/ai/group_template/HotSprings.java
index 685f91655e879607b57949b5ffff5dc0efc8c863..c33b771686f3da77b34a5a8ea443b239bdd7e5a9 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/HotSprings.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/HotSprings.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Hot Springs AI.
* @author Pandragon
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/IsleOfPrayer.java b/src/main/java/com/l2jserver/datapack/ai/group_template/IsleOfPrayer.java
index 51c64301c2a31b0db02890e3038349f7906adfd0..212458853fec4965f6c781d609bfcc890ff70b0f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/IsleOfPrayer.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/IsleOfPrayer.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemChanceHolder;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/LairOfAntharas.java b/src/main/java/com/l2jserver/datapack/ai/group_template/LairOfAntharas.java
index 0ad0bea805820e5cd2468e90c0b27ed0f58f502e..391af150d6ac39ac1e590477cdde67b973b3765a 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/LairOfAntharas.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/LairOfAntharas.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Lair of Antharas AI.
* @author St3eT, UnAfraid
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/MinionSpawnManager.java b/src/main/java/com/l2jserver/datapack/ai/group_template/MinionSpawnManager.java
index 63a6afa8f546ad0cc235d9bdfc17408b3ca545e1..7c2d9e7c824b2d1b89c912d2dfb811f2fa679255 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/MinionSpawnManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/MinionSpawnManager.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.ai.group_template;
import java.util.HashSet;
import java.util.Set;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -28,8 +29,6 @@ import com.l2jserver.gameserver.model.holders.MinionHolder;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Minion Spawn Manager.
* @author Zealar
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/MonasteryOfSilence.java b/src/main/java/com/l2jserver/datapack/ai/group_template/MonasteryOfSilence.java
index ee8b913c175c9e451c6342d31b9562b31ea9fa89..968e3d4882e832a8954fd311909427d492a2e8c6 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/MonasteryOfSilence.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/MonasteryOfSilence.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -30,8 +31,6 @@ import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Monastery of Silence AI.
* @author Kerberos, nonom
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/NonLethalableNpcs.java b/src/main/java/com/l2jserver/datapack/ai/group_template/NonLethalableNpcs.java
index 7348d5ae4be0a603a063f468b13b0d6202f467d3..a12fcaa4650964e36397bdeb608fee793df437a5 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/NonLethalableNpcs.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/NonLethalableNpcs.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
/**
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/NonTalkingNpcs.java b/src/main/java/com/l2jserver/datapack/ai/group_template/NonTalkingNpcs.java
index c95f771e971c01b42f955017d0478b8044d3d62b..6021371b50c6b066b9db44eba8bdb9a4ed84b1ad 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/NonTalkingNpcs.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/NonTalkingNpcs.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
/**
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/PavelArchaic.java b/src/main/java/com/l2jserver/datapack/ai/group_template/PavelArchaic.java
index 2092a74a73364c505b80c702e75e3b58b0555b89..a1fc80b29e82a086c5eeed24bf0832c80907cb56 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/PavelArchaic.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/PavelArchaic.java
@@ -18,11 +18,10 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Pavel Archaic AI.
* @author Gnacik, St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfDion.java b/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfDion.java
index f5a342f6d16b5603ac120d9c65ef8cec3d0c2675..5ffa9dd587db73792db0e51e2c194be6efae01f0 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfDion.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfDion.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -26,8 +27,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* AI for mobs in Plains of Dion (near Floran Village).
* @author Gladicek
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfLizardman.java b/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfLizardman.java
index c6e6e5bb38395c37e2ebe47a5edf6514e020d247..d8536afc5668dc32ba0ab63e8b862e015daac9e3 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfLizardman.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/PlainsOfLizardman.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Plains of Lizardmen AI.
* @author Gnacik, malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingAngel.java b/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingAngel.java
index 4af4a3f79ffebb90b910b88e589fb66ac3b904fe..6c6fe8c33c939c7ea88aa79db25e09485020dd70 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingAngel.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingAngel.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingOnAttack.java b/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingOnAttack.java
index 93e0d1bbf3593e0efdea9e226191f80c8cc2675f..d82147e2a1f9c2a6a409d6cd6734191be55951f3 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingOnAttack.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/PolymorphingOnAttack.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/PrimevalIsle.java b/src/main/java/com/l2jserver/datapack/ai/group_template/PrimevalIsle.java
index 5b1349e1ed9b2c5570c04730e6957e4750d91158..462be831853cac9c6df8aba0c66adbf919c385fa 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/PrimevalIsle.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/PrimevalIsle.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.handler.IItemHandler;
@@ -35,8 +36,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Primeval Isle AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/PrisonGuards.java b/src/main/java/com/l2jserver/datapack/ai/group_template/PrisonGuards.java
index 7cf3b37b4d01ef021e833936708cf330db100197..74df5efd374859cf31ce6768e61b78d83d9a9d78 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/PrisonGuards.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/PrisonGuards.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Prison Guards AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/RaidBossCancel.java b/src/main/java/com/l2jserver/datapack/ai/group_template/RaidBossCancel.java
index 2d02ee04dd35a5c4c90707025ee3799e99ee6c22..fd63896b91684a9aae983632e6f336dff4bcb52d 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/RaidBossCancel.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/RaidBossCancel.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Raid Boss Cancel AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/RandomSpawn.java b/src/main/java/com/l2jserver/datapack/ai/group_template/RandomSpawn.java
index d500262267dd6a526bf47e4ee3c1c9012e09363c..4b32245458f96224fec173369bb0bda705936dad 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/RandomSpawn.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/RandomSpawn.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/RangeGuard.java b/src/main/java/com/l2jserver/datapack/ai/group_template/RangeGuard.java
index 4b2a3dc12adb38adc4933287027770924f4c9c0f..ba1fa1504786dda5b7a46cf1ed6a86a4c03fee82 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/RangeGuard.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/RangeGuard.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -28,8 +29,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Range Guard AI.
* @author St3eT.
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/Remnants.java b/src/main/java/com/l2jserver/datapack/ai/group_template/Remnants.java
index c2c3c9c8e4673a26e7508f1b830ad345b2953cf3..e8ad220af5c4b1bb115fd4ba4e5182989d9d7b2d 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/Remnants.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/Remnants.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/Sandstorms.java b/src/main/java/com/l2jserver/datapack/ai/group_template/Sandstorms.java
index ffc0383a66ccd7d143c763b71efc218d88db3f62..9a247c9701c25c993ca4c93c9474eade4401b1de 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/Sandstorms.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/Sandstorms.java
@@ -18,12 +18,11 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Sandstorms AI.
* @author Ectis
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/SeeThroughSilentMove.java b/src/main/java/com/l2jserver/datapack/ai/group_template/SeeThroughSilentMove.java
index 91dcc03498cc31bf1d36e294b76d4892f22160a1..180d2cdd3101b000d2a63c5b667b8ba8d95a663a 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/SeeThroughSilentMove.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/SeeThroughSilentMove.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumDrill.java b/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumDrill.java
index b5dcbc33d24d08a4c2eabbe3da31ce5a6cb1fa9a..517c4222ba4638e4bb596473d283cc1ac9a5ae1a 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumDrill.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumDrill.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.model.L2Object;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumSquad.java b/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumSquad.java
index 2f6320b96cf07b583a24d26ca504564d87260e5c..52f6d7dd8c375d575a3589900775196f2e42ba1f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumSquad.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/SelMahumSquad.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.L2Object;
@@ -31,8 +32,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Sel Mahum Training Ground AI for squads and chefs.
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/SilentValley.java b/src/main/java/com/l2jserver/datapack/ai/group_template/SilentValley.java
index aedb41ded06c4c97a07c478962dc760f3515ccc4..22927ed4316e750d695dbbfcf07bb95899c81e2f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/SilentValley.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/SilentValley.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Silent Valley AI
* @author malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/StakatoNest.java b/src/main/java/com/l2jserver/datapack/ai/group_template/StakatoNest.java
index c789b8b9e68f4894a002cb43af5014a1efca5bde..16ec058a62f59347577bb8a6f7a76a86f812a661 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/StakatoNest.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/StakatoNest.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.ai.group_template;
import java.util.List;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
@@ -30,8 +31,6 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.util.Broadcast;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Stakato Nest AI.
* @author Gnacik
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/SummonPc.java b/src/main/java/com/l2jserver/datapack/ai/group_template/SummonPc.java
index 7efeddd6ddaeae2e146611ec412c410d504e9375..1089b9ceca60ab43665b12795beea174e1ec553b 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/SummonPc.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/SummonPc.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.ai.group_template;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Summon Pc AI.<br>
* Summon the player to the NPC on attack.
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/TreasureChest.java b/src/main/java/com/l2jserver/datapack/ai/group_template/TreasureChest.java
index d3dab6f8efca5933d5bca11960124b1454c2f091..0469a36cbdff03916b8dbb0d88e33cc6151e06a9 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/TreasureChest.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/TreasureChest.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemChanceHolder;
@@ -30,8 +31,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Treasure Chest AI.
* @author ivantotov
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/TurekOrcs.java b/src/main/java/com/l2jserver/datapack/ai/group_template/TurekOrcs.java
index 328342b38f4d6d927a0329c483f7a626a59aaa99..cc3c0755ab08000ee2105c8f730b369e077931e1 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/TurekOrcs.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/TurekOrcs.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2World;
diff --git a/src/main/java/com/l2jserver/datapack/ai/group_template/WarriorFishingBlock.java b/src/main/java/com/l2jserver/datapack/ai/group_template/WarriorFishingBlock.java
index fdebf175bab59bbd2df72ce9b9dee8cba9985da9..ec30cd0a04622c9ccd094426110f881f32c04e1f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/group_template/WarriorFishingBlock.java
+++ b/src/main/java/com/l2jserver/datapack/ai/group_template/WarriorFishingBlock.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.group_template;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlEvent;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Attackable;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Anais.java b/src/main/java/com/l2jserver/datapack/ai/individual/Anais.java
index 24986ab2476775ccf4207d35d6bd1889e6712f9d..7f42cd71a2959f7915e67c2f3276be790cdcea20 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Anais.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Anais.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.ai.individual;
import java.util.ArrayList;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -29,8 +30,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.quest.QuestTimer;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Anais AI.
* @author nonom
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Antharas/Antharas.java b/src/main/java/com/l2jserver/datapack/ai/individual/Antharas/Antharas.java
index 75337d8e31add91789181df7da162f66b52f30dc..f67501f459f5b4b1d5509bf9c9b0dd9105b2e1ff 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Antharas/Antharas.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Antharas/Antharas.java
@@ -22,8 +22,9 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.MountType;
import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
@@ -47,8 +48,6 @@ import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
import com.l2jserver.gameserver.util.Broadcast;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Antharas AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Baium/Baium.java b/src/main/java/com/l2jserver/datapack/ai/individual/Baium/Baium.java
index 72b0415776291f61d233e018c277c14c9dd1374a..b31a598dcbbc660ff00294058b1562a9d9b48401 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Baium/Baium.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Baium/Baium.java
@@ -18,8 +18,9 @@
*/
package com.l2jserver.datapack.ai.individual.Baium;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.MountType;
import com.l2jserver.gameserver.enums.audio.Music;
@@ -43,8 +44,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Baium AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Ballista.java b/src/main/java/com/l2jserver/datapack/ai/individual/Ballista.java
index 202757a0325130e3dce2fa9840fdc7a698e6fb9b..35aa57cefe81c16f47c44ef72427ca03bfdf1c54 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Ballista.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Ballista.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Beleth.java b/src/main/java/com/l2jserver/datapack/ai/individual/Beleth.java
index 1a137add7ffc0551f3aec3c41fa29f1662fbcd8a..fd9921727c23c66b2c6e9d926e8798e6cbcf8a10 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Beleth.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Beleth.java
@@ -21,9 +21,10 @@ package com.l2jserver.datapack.ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
@@ -50,8 +51,6 @@ import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
import com.l2jserver.gameserver.network.serverpackets.StaticObject;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Beleth's AI.
* @author Treat, Sahar
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/BlackdaggerWing.java b/src/main/java/com/l2jserver/datapack/ai/individual/BlackdaggerWing.java
index 81231bbe0305efd46b7024eb68181464dea76764..f918fd9182c5c6285ac4c3515e5f0be6fd4c47db 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/BlackdaggerWing.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/BlackdaggerWing.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.ai.individual;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -28,8 +29,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Blackdagger Wing AI.
* @author Zoey76
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/BleedingFly.java b/src/main/java/com/l2jserver/datapack/ai/individual/BleedingFly.java
index af1d97eda17b840116be55fa900039a7d5d46b46..68c1f681a672cb3edcc187ee573310b8bfaaee63 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/BleedingFly.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/BleedingFly.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Bleeding Fly AI.
* @author Zoey76
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Core.java b/src/main/java/com/l2jserver/datapack/ai/individual/Core.java
index 519813abeaac14d5e37f0431534f093a15d14469..e1687085910c5673136eb1cb56b0d9a6885d821b 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Core.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Core.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
@@ -33,8 +34,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Core AI.
* @author DrLecter, Emperorc
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/CrimsonHatuOtis.java b/src/main/java/com/l2jserver/datapack/ai/individual/CrimsonHatuOtis.java
index c91f1a3f9d198d1c2148991f33a114f35c15475a..e63816d649e25feae957faca3c6359303b6152b8 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/CrimsonHatuOtis.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/CrimsonHatuOtis.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* AI for Kamaloka (33) - Crimson Hatu Otis
* @author Gladicek
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/DarkWaterDragon.java b/src/main/java/com/l2jserver/datapack/ai/individual/DarkWaterDragon.java
index ca699ee10f9c5d9bfef1fc8a10a8be26e8ad4d55..7b571f28912b4bbb4bffccab75a5db858517f320 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/DarkWaterDragon.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/DarkWaterDragon.java
@@ -23,7 +23,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.model.actor.L2Attackable;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/DivineBeast.java b/src/main/java/com/l2jserver/datapack/ai/individual/DivineBeast.java
index 0919821a8c1609fd719266ab18f49e355854587c..cdd57574ca484a17db0582e36e7c252c563e26dd 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/DivineBeast.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/DivineBeast.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/DrakosWarrior.java b/src/main/java/com/l2jserver/datapack/ai/individual/DrakosWarrior.java
index 57d74d5c189a94213fed93bf01889e6814167437..b4ce8bb183987d4701c90b7a475031ddc952fe9f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/DrakosWarrior.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/DrakosWarrior.java
@@ -18,12 +18,11 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Drakos Warrior AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/DustRider.java b/src/main/java/com/l2jserver/datapack/ai/individual/DustRider.java
index 86f1912324fa0849dff2f1111386979a15cdbbb9..84c4ed34310a29b9dfd6f4a649f81141b7b83287 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/DustRider.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/DustRider.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Dust Rider AI.
* @author Zoey76
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/EmeraldHorn.java b/src/main/java/com/l2jserver/datapack/ai/individual/EmeraldHorn.java
index afb1920c3badeb81aafaa072772349a8dde60564..2e6bb4b8e6e59707c8c4260c944e24df83ab85d8 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/EmeraldHorn.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/EmeraldHorn.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -26,8 +27,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Emerald Horn AI.
* @author Zoey76
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Epidos.java b/src/main/java/com/l2jserver/datapack/ai/individual/Epidos.java
index b734666812dd5907874b2b6d7c4c5ff856ec32ed..beecfe3fc83e1a1674a704291b39a506890814aa 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Epidos.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Epidos.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/EvasGiftBox.java b/src/main/java/com/l2jserver/datapack/ai/individual/EvasGiftBox.java
index f838c96fb1ed5bf1ec3a1cc9560ebcbde3dd7adb..61e2997e3da5bb7811ee7c438a8db78fa62fd3fe 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/EvasGiftBox.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/EvasGiftBox.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/FrightenedRagnaOrc.java b/src/main/java/com/l2jserver/datapack/ai/individual/FrightenedRagnaOrc.java
index 564935b8807df1816bb3ed9ef06c90386ecdbe70..fe6b7ce6417b697bc6f86a485c021d126f1a4e75 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/FrightenedRagnaOrc.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/FrightenedRagnaOrc.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -28,8 +29,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Frightened Ragna Orc AI.
* @author Gladicek, malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Gordon.java b/src/main/java/com/l2jserver/datapack/ai/individual/Gordon.java
index 65a4d1cec025837008ae74af4e7c2de5c66bffc9..250a1663ddf050a014dd71d0c11410575581af6f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Gordon.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Gordon.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Gordon AI
* @author TOFIZ, malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/GraveRobbers.java b/src/main/java/com/l2jserver/datapack/ai/individual/GraveRobbers.java
index 6ca8047b6ed8e3db5468edaa928387fb432ed141..c0ce193619828977976bb43ee46ca4728caed8bf 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/GraveRobbers.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/GraveRobbers.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
/**
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/MuscleBomber.java b/src/main/java/com/l2jserver/datapack/ai/individual/MuscleBomber.java
index 7e0fa0152601f6661b50d412ce0885496d055991..b6ab1945a1a5f9c13667150ee5ac6cda4b2c8de7 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/MuscleBomber.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/MuscleBomber.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Muscle Bomber AI.
* @author Zoey76
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/NecromancerOfTheValley.java b/src/main/java/com/l2jserver/datapack/ai/individual/NecromancerOfTheValley.java
index 83ad4462c679563adefa3b5f5fb91434dff6eb5e..50485aa12b936e0c97fe554bedb8246922724287 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/NecromancerOfTheValley.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/NecromancerOfTheValley.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.individual;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Necromancer of the Valley AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Orfen.java b/src/main/java/com/l2jserver/datapack/ai/individual/Orfen.java
index 0b09308bdd3d8a75cbe2506ad0fa5ffaaadea871..f4230b7adaaa85f01b3388a117779ca243ac624f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Orfen.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Orfen.java
@@ -21,8 +21,9 @@ package com.l2jserver.datapack.ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.model.L2Object;
@@ -41,8 +42,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Orfen's AI
* @author Emperorc
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java b/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java
index 2bf6841e3bef99891165703400b541ac761a9c82..2007ea154bf152790cfd72672bac752c7e903531 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/QueenAnt.java
@@ -21,8 +21,9 @@ package com.l2jserver.datapack.ai.individual;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.model.Location;
@@ -39,8 +40,6 @@ import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.zone.type.L2BossZone;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Queen Ant's AI
* @author Emperorc
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/QueenShyeed.java b/src/main/java/com/l2jserver/datapack/ai/individual/QueenShyeed.java
index bd00fd03e8df7624876cf9061e05fce7e6b01edb..3191d58bfd511149ef89eb02e5e2746713331bab 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/QueenShyeed.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/QueenShyeed.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcCommander.java b/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcCommander.java
index aedc2af9cdbd2b240306e25ba496cf894aaf7350..0deb04f1aa867ade5710b8bad69de6d475afbff4 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcCommander.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcCommander.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
/**
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcHero.java b/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcHero.java
index 58bbbd6994dad181724d0a9fe4d767d644d03895..935ad3a992086458477ab7bfc10c68b4f22dd8cf 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcHero.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcHero.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
/**
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcSeer.java b/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcSeer.java
index 91a863d1d2dc94c7988a374bc9c7d531c694d815..f3651cb6d034d1874687b34cbed084dfb2ed9083 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcSeer.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/RagnaOrcSeer.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
/**
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Sailren/Sailren.java b/src/main/java/com/l2jserver/datapack/ai/individual/Sailren/Sailren.java
index 1e1dabf3fa3236e65510af5f6a83b37c832c5ea5..aee3ca5d335814bb912618600631f25bbb3f21a1 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Sailren/Sailren.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Sailren/Sailren.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.individual.Sailren;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.TeleportWhereType;
@@ -29,8 +30,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.zone.type.L2NoRestartZone;
import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Sailren AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/ShadowSummoner.java b/src/main/java/com/l2jserver/datapack/ai/individual/ShadowSummoner.java
index a194749b962094d8e6a80ff6a2e76843c9eaf5f1..c72f16ee29d24b2d8d596b3257cf52663a5153b2 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/ShadowSummoner.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/ShadowSummoner.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.ai.individual;
import static com.l2jserver.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Shadow Summoner AI.
* @author Zoey76
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/SinEater.java b/src/main/java/com/l2jserver/datapack/ai/individual/SinEater.java
index d8d733a0bbc04482f7e38a1764d2aa5de3f62e7d..7e02a4f27166d75dc16de3c345b67a649372ca52 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/SinEater.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/SinEater.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.individual;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/SinWardens.java b/src/main/java/com/l2jserver/datapack/ai/individual/SinWardens.java
index d9d2495a72c9d875500a0f2bad892b4562f9959b..0c101d04be8186a9c1a2ce530a50c78ac43104e3 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/SinWardens.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/SinWardens.java
@@ -22,7 +22,6 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Valakas.java b/src/main/java/com/l2jserver/datapack/ai/individual/Valakas.java
index 3e345c8ba146793d93c62a1bb13729ca57a2de1b..56d962f2eca0f8b472db2ef569fa1ef4fffec35c 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Valakas.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Valakas.java
@@ -21,9 +21,10 @@ package com.l2jserver.datapack.ai.individual;
import java.util.ArrayList;
import java.util.List;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.MountType;
import com.l2jserver.gameserver.enums.audio.Music;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
@@ -41,8 +42,6 @@ import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Valakas' AI.
* @author Tryskell
diff --git a/src/main/java/com/l2jserver/datapack/ai/individual/Venom/Venom.java b/src/main/java/com/l2jserver/datapack/ai/individual/Venom/Venom.java
index 9b4ccafba8770df0c30b2a3aca38c766435b1407..611faf852cedd05b702bfd778dacdd05606e9fb2 100644
--- a/src/main/java/com/l2jserver/datapack/ai/individual/Venom/Venom.java
+++ b/src/main/java/com/l2jserver/datapack/ai/individual/Venom/Venom.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.ai.individual.Venom;
import java.util.ArrayList;
import java.util.List;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
@@ -37,8 +38,6 @@ import com.l2jserver.gameserver.model.zone.ZoneId;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Venom AI on Rune Castle.
* @author nonom, MELERIX
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Abercrombie/Abercrombie.java b/src/main/java/com/l2jserver/datapack/ai/npc/Abercrombie/Abercrombie.java
index a0eec5cae03c72f359de1400edeef8c6ee4d5cd6..e07997b93e3416aa664dd4dfb22462724e75f617 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Abercrombie/Abercrombie.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Abercrombie/Abercrombie.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Abercrombie;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Alexandria/Alexandria.java b/src/main/java/com/l2jserver/datapack/ai/npc/Alexandria/Alexandria.java
index 80f940bc4d053a15244e03ec39309491a7a4af6f..5b2475b6afb1e0d3570d266e2613670f5d3a2184 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Alexandria/Alexandria.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Alexandria/Alexandria.java
@@ -23,13 +23,12 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.holders.QuestItemHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Alexandria (Armor Merchant) AI.
* @author xban1x
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ArenaManager/ArenaManager.java b/src/main/java/com/l2jserver/datapack/ai/npc/ArenaManager/ArenaManager.java
index 60d3322ef61f4aa2c6b1c06a6a2128870e888e06..c3810e2cc7d557b867ae8599c937a155ace4a6ff 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ArenaManager/ArenaManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ArenaManager/ArenaManager.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.npc.ArenaManager;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.zone.ZoneId;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Arena Manager AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Asamah/Asamah.java b/src/main/java/com/l2jserver/datapack/ai/npc/Asamah/Asamah.java
index 092402bfb2006e29a8aeaa6b22b3922afebdba2d..5ff5149aecb33823c3225792e1ebb0b36dd194ec 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Asamah/Asamah.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Asamah/Asamah.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.npc.Asamah;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.quests.Q00111_ElrokianHuntersProof.Q00111_ElrokianHuntersProof;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.quests.Q00111_ElrokianHuntersProof.Q00111_ElrokianHuntersProof;
-
/**
* Asamah AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/BlackJudge/BlackJudge.java b/src/main/java/com/l2jserver/datapack/ai/npc/BlackJudge/BlackJudge.java
index ad6a18cc4db10759bb0c3794154ca39d85c2598d..336a4bfc7283c7731d827b1b71865f79b09456e8 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/BlackJudge/BlackJudge.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/BlackJudge/BlackJudge.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.BlackJudge;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/src/main/java/com/l2jserver/datapack/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
index 5c3e9b1e84dc5bd938124d489658f3b6c1e944cf..b40034c47c3c4b24a97f7ac2cbefd25cd38acd5c 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.ai.npc.BlackMarketeerOfMammon;
import java.time.LocalTime;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.enums.QuestType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Black Marketeer of Mammon - Exchange Adena for AA.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleAmbassador/CastleAmbassador.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleAmbassador/CastleAmbassador.java
index 1299eb68df83e0820b17e21546b38180ca728787..adffafdf66a2670a00913f5b6bf09291348f36ed 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleAmbassador/CastleAmbassador.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleAmbassador/CastleAmbassador.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.CastleAmbassador;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleBlacksmith/CastleBlacksmith.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleBlacksmith/CastleBlacksmith.java
index fe5b7a6cd5448ba91b366176248cd62f03bae908..04015a968af5e17fb42410db33891436115c6d1a 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleBlacksmith/CastleBlacksmith.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleBlacksmith/CastleBlacksmith.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.CastleBlacksmith;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java
index bfa76d953f13d1b309061dec730498c8c72703e3..d7ef7ccc694f8b6df1321aa88d7172efeb67da23 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleChamberlain/CastleChamberlain.java
@@ -25,8 +25,9 @@ import java.util.List;
import java.util.Map;
import java.util.StringTokenizer;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.data.sql.impl.TeleportLocationTable;
import com.l2jserver.gameserver.instancemanager.CastleManorManager;
@@ -62,8 +63,6 @@ import com.l2jserver.gameserver.network.serverpackets.ExShowSeedSetting;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Castle Chamberlain AI.
* @author malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleCourtMagician/CastleCourtMagician.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleCourtMagician/CastleCourtMagician.java
index f0b31bb547b6b09897f8febe986e31fc3e30581e..e6c6e0c960f6e9105e58026a8604d048363cdc87 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleCourtMagician/CastleCourtMagician.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleCourtMagician/CastleCourtMagician.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.ai.npc.CastleCourtMagician;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.network.clientpackets.RequestAcquireSkill;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Castle Court Magician AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
index 01449f166c4c17cb2982cf25d959eef43c590000..f10534b330ae818b25edc8203e976520c668c51d 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java
@@ -21,7 +21,6 @@ package com.l2jserver.datapack.ai.npc.CastleMercenaryManager;
import java.util.StringTokenizer;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.PcCondOverride;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleSiegeManager/CastleSiegeManager.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleSiegeManager/CastleSiegeManager.java
index 96ff538956f75eafe0cab3b4c3fc41394983e297..e5571cf61f469a06fd1df21eae5f8bbda868bf56 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleSiegeManager/CastleSiegeManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleSiegeManager/CastleSiegeManager.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.CastleSiegeManager;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleTeleporter/CastleTeleporter.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleTeleporter/CastleTeleporter.java
index f9a5e9843e9a0b60488fb5135516a5e233bb2dad..c8def615a7403ef24a1e55763d5a0ed9b5e42a50 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleTeleporter/CastleTeleporter.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleTeleporter/CastleTeleporter.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.CastleTeleporter;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.instancemanager.MapRegionManager;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/CastleWarehouse/CastleWarehouse.java b/src/main/java/com/l2jserver/datapack/ai/npc/CastleWarehouse/CastleWarehouse.java
index 81f563306ae2da130e91afd78df81231bacbdac8..a8d4e3977dc829e6ee504d374500c3ae3d6f9732 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/CastleWarehouse/CastleWarehouse.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/CastleWarehouse/CastleWarehouse.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.CastleWarehouse;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ClanTrader/ClanTrader.java b/src/main/java/com/l2jserver/datapack/ai/npc/ClanTrader/ClanTrader.java
index 0124d14fad65d9601b05aa6adb12390982a05a8d..3e4d86252209632a4482485799be4c7122f0f00e 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ClanTrader/ClanTrader.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ClanTrader/ClanTrader.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.ClanTrader;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ClassMaster/ClassMaster.java b/src/main/java/com/l2jserver/datapack/ai/npc/ClassMaster/ClassMaster.java
index c6d756e558bbdd569aac06faf5659fd0aa040de7..9e2dbb1241084c170ae8031975b6dd53e578c5d3 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ClassMaster/ClassMaster.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ClassMaster/ClassMaster.java
@@ -28,6 +28,7 @@ import static com.l2jserver.gameserver.network.SystemMessageId.INVENTORY_LESS_TH
import static com.l2jserver.gameserver.network.SystemMessageId.NOT_ENOUGH_ITEMS;
import static com.l2jserver.gameserver.network.serverpackets.TutorialCloseHtml.STATIC_PACKET;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.data.xml.impl.ClassListData;
import com.l2jserver.gameserver.datatables.ItemTable;
import com.l2jserver.gameserver.model.Location;
@@ -43,9 +44,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.TutorialShowHtml;
import com.l2jserver.gameserver.network.serverpackets.TutorialShowQuestionMark;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
-import com.l2jserver.util.StringUtil;
-
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* Handle both NPC and tutorial window.
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/DragonVortex/DragonVortex.java b/src/main/java/com/l2jserver/datapack/ai/npc/DragonVortex/DragonVortex.java
index 6bfb6fab481b768b0c99ba9a6ec60b908de7fd29..618ee58ad16d57aeb1827c8b57122d64c61557a8 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/DragonVortex/DragonVortex.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/DragonVortex/DragonVortex.java
@@ -18,12 +18,11 @@
*/
package com.l2jserver.datapack.ai.npc.DragonVortex;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Dragon Vortex AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/EchoCrystals/EchoCrystals.java b/src/main/java/com/l2jserver/datapack/ai/npc/EchoCrystals/EchoCrystals.java
index 56fe026766f97105d99029e182602a2f46aff67f..83e338a00cb18dbd245d8155a08591ca1b526780 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/EchoCrystals/EchoCrystals.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/EchoCrystals/EchoCrystals.java
@@ -21,12 +21,11 @@ package com.l2jserver.datapack.ai.npc.EchoCrystals;
import java.util.HashMap;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Echo Crystals AI.
* @author Plim, Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/FameManager/FameManager.java b/src/main/java/com/l2jserver/datapack/ai/npc/FameManager/FameManager.java
index b8e97eb1054252c6ca013d2751bb3aef6333c1c2..bbff43069e989bbf7f6204c0599bec0c7a3a47c4 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/FameManager/FameManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/FameManager/FameManager.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.FameManager;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Fisherman/Fisherman.java b/src/main/java/com/l2jserver/datapack/ai/npc/Fisherman/Fisherman.java
index aaf99d7eb7590680edc8ac8b579e66289332edd7..3f19b194aab5301826d404390ca13df8a6998b53 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Fisherman/Fisherman.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Fisherman/Fisherman.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.ai.npc.Fisherman;
import java.util.List;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.datatables.SkillData;
@@ -32,8 +33,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.AcquireSkillList;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Fisherman AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
index eea0b6082b28d09cdb6035c3c083ea33bfebe001..06fee1817416d4b5c7dd1f85ddaead0734ba1534 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.ForgeOfTheGods;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/Rooney.java b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/Rooney.java
index 27445a7246abe6e24a2c245b77a124205c9f9fda..254cfad2c07db546199e27e87b7e55c74c1b5c2a 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/Rooney.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/Rooney.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.npc.ForgeOfTheGods;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Rooney AI
* @author malyelfik, Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetle.java b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetle.java
index f97af09a7828da94472189b06dca1de24e29d0d1..b2da24bbca75840cb1e69ab4139113ebe600427e 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetle.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetle.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.ai.npc.ForgeOfTheGods;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Tar Beetle AI
* @author nonom, malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java
index aaca8444bb4eb2bacceddb8a611713ba2844528d..a773c83b29008da8a96eb90942943a6c15f5fdd2 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java
@@ -27,6 +27,7 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.L2Spawn;
@@ -34,7 +35,6 @@ import com.l2jserver.gameserver.model.L2Territory;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.util.IXmlReader;
-import com.l2jserver.util.Rnd;
/**
* Tar Beetle zone spawn
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java b/src/main/java/com/l2jserver/datapack/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
index 76bc301e8d035a1928fb468e783d366a7a58bda1..fad0a17e624932378d7b52fa64377dc851a98c21 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.FortressArcherCaptain;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/FortressSiegeManager/FortressSiegeManager.java b/src/main/java/com/l2jserver/datapack/ai/npc/FortressSiegeManager/FortressSiegeManager.java
index 60645e3e1f54fbaa525427a005253bf73aaeed45..f81224e64316b3d09642e851f9a0b613830f172f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/FortressSiegeManager/FortressSiegeManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/FortressSiegeManager/FortressSiegeManager.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.FortressSiegeManager;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.L2Clan;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/FreyasSteward/FreyasSteward.java b/src/main/java/com/l2jserver/datapack/ai/npc/FreyasSteward/FreyasSteward.java
index 8026d2f521cf7a82c2bd1b65b6af5bac95c2f74d..a6bac2a005d67ba8e444572a49b6369cd151f44b 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/FreyasSteward/FreyasSteward.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/FreyasSteward/FreyasSteward.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.FreyasSteward;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/KetraOrcSupport/KetraOrcSupport.java b/src/main/java/com/l2jserver/datapack/ai/npc/KetraOrcSupport/KetraOrcSupport.java
index 2ff2635167387c19c8fc0cd4da1fd351348a1fdc..9e11f4ac31db2b9046eb5a7bc0dd4ca9f98cafe2 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/KetraOrcSupport/KetraOrcSupport.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/KetraOrcSupport/KetraOrcSupport.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Kier/Kier.java b/src/main/java/com/l2jserver/datapack/ai/npc/Kier/Kier.java
index e8656609629b5739cebf2714a4c4ebe93d820ba1..9ca950299440d6b46859e6c909b25c5f24220d1a 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Kier/Kier.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Kier/Kier.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.npc.Kier;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.quest.QuestState;
-
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.datapack.quests.Q00115_TheOtherSideOfTruth.Q00115_TheOtherSideOfTruth;
import com.l2jserver.datapack.quests.Q10283_RequestOfIceMerchant.Q10283_RequestOfIceMerchant;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.QuestState;
/**
* Kier AI.
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/ManorManager/ManorManager.java b/src/main/java/com/l2jserver/datapack/ai/npc/ManorManager/ManorManager.java
index 1f99aaf794b357e8df73abb7f8c6830150036e95..cb8c7a1d58631ca3716e2e83fbee6c2bba908d57 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/ManorManager/ManorManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/ManorManager/ManorManager.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.ManorManager;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.instancemanager.CastleManorManager;
import com.l2jserver.gameserver.model.PcCondOverride;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/MercenaryCaptain/MercenaryCaptain.java b/src/main/java/com/l2jserver/datapack/ai/npc/MercenaryCaptain/MercenaryCaptain.java
index 93b0bb65464091564afd893a55a2a255cf8cbbd2..d2ee5180f20f5436b1eafa2d9f41ae0455906e62 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/MercenaryCaptain/MercenaryCaptain.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/MercenaryCaptain/MercenaryCaptain.java
@@ -23,7 +23,6 @@ import java.util.Map;
import java.util.StringTokenizer;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
import com.l2jserver.gameserver.instancemanager.TerritoryWarManager.Territory;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Minigame/Minigame.java b/src/main/java/com/l2jserver/datapack/ai/npc/Minigame/Minigame.java
index 0c79355cb8bcced4e64c7c4d3b8191cfb2a10249..a1e6a6ecaeef4d8c29216ac03251577dde7ca425 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Minigame/Minigame.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Minigame/Minigame.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.ai.npc.Minigame;
import java.util.ArrayList;
import java.util.List;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Spawn;
@@ -35,8 +36,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Monastery Minigame AI.
* @author nonom
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java b/src/main/java/com/l2jserver/datapack/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
index 39f8c213e7ffed095d06257d7ef5aa1fca859a45..2a58ce70b689501d472206538d75cfa4905ccb1b 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.MonumentOfHeroes;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.util.Util;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/NevitsHerald/NevitsHerald.java b/src/main/java/com/l2jserver/datapack/ai/npc/NevitsHerald/NevitsHerald.java
index f14bc4cdb020150f65bbf229af9a429da5443226..20d306b5648a4bd592e17f2b00c51ff6349c2aca 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/NevitsHerald/NevitsHerald.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/NevitsHerald/NevitsHerald.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.ai.npc.NevitsHerald;
import java.util.ArrayList;
import java.util.List;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -31,9 +32,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.util.Rnd;
-
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
/**
* Nevit's Herald AI.
@@ -105,7 +103,7 @@ public final class NevitsHerald extends AbstractNpcAI
else if (event.equalsIgnoreCase("text_spam"))
{
cancelQuestTimer("text_spam", npc, player);
- npc.broadcastPacket(new NpcSay(NEVITS_HERALD, Say2.SHOUT, NEVITS_HERALD, SPAM[Rnd.get(0, SPAM.length - 1)]));
+ npc.broadcastPacket(new NpcSay(NEVITS_HERALD, Say2.SHOUT, NEVITS_HERALD, SPAM[getRandom(0, SPAM.length - 1)]));
startQuestTimer("text_spam", 60000, npc, player);
return null;
}
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/NpcBuffers.java b/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/NpcBuffers.java
index 8ab85ae79d12954dc153862200feca1286a75bd7..e1252349cc987d38f7c311597f5e8f92cb3ec69c 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/NpcBuffers.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/NpcBuffers.java
@@ -18,12 +18,11 @@
*/
package com.l2jserver.datapack.ai.npc.NpcBuffers;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* @author UnAfraid
*/
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/impl/CabaleBuffer.java b/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/impl/CabaleBuffer.java
index 109d2f89de8255f1e53f8e1ec708f0ff3c7c541c..9ba37429678d66ca39a2b6b4d8b0ca8d8f8214c1 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/impl/CabaleBuffer.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/NpcBuffers/impl/CabaleBuffer.java
@@ -21,7 +21,6 @@ package com.l2jserver.datapack.ai.npc.NpcBuffers.impl;
import java.util.Collection;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.datatables.SkillData;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/PriestOfBlessing/PriestOfBlessing.java b/src/main/java/com/l2jserver/datapack/ai/npc/PriestOfBlessing/PriestOfBlessing.java
index c1303b5d005ad7e77e085db1f4b2071b76586c9a..368608e1c6f0bea0152eb13b5d4aaf40c43bf40f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/PriestOfBlessing/PriestOfBlessing.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/PriestOfBlessing/PriestOfBlessing.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.PriestOfBlessing;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Rafforty/Rafforty.java b/src/main/java/com/l2jserver/datapack/ai/npc/Rafforty/Rafforty.java
index 6432abe5cfcf1cea5e0fe445e7bea96b55ae5296..431e5c1eff233f81a40affa2f6f0369855ef4e6e 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Rafforty/Rafforty.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Rafforty/Rafforty.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Rafforty;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Rignos/Rignos.java b/src/main/java/com/l2jserver/datapack/ai/npc/Rignos/Rignos.java
index 7eadeaa19d15b1792266214d1cefbf8edacdbae9..c22ae34449fa11f67cb343d8d782a231e48af4d6 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Rignos/Rignos.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Rignos/Rignos.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Rignos;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Selina/Selina.java b/src/main/java/com/l2jserver/datapack/ai/npc/Selina/Selina.java
index abd8056bc1537bac8f3e603af2421360d2b04ee7..a5539bb5a111e463ffd9e63832648b89096061e7 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Selina/Selina.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Selina/Selina.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Sirra/Sirra.java b/src/main/java/com/l2jserver/datapack/ai/npc/Sirra/Sirra.java
index d7b6f072ec2a5d0d44bc2fd68c5fc6bc19dd5960..0659bbbf3e239f634ad41b10ab55bf0d57ff6592 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Sirra/Sirra.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Sirra/Sirra.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Sirra;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/SubclassCertification/SubclassCertification.java b/src/main/java/com/l2jserver/datapack/ai/npc/SubclassCertification/SubclassCertification.java
index cb77d367a460eb9cc33a83c1619be5fe737bd22d..641c1e79fc66e4753c9368e2155915dc15022bc8 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/SubclassCertification/SubclassCertification.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/SubclassCertification/SubclassCertification.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.data.xml.impl.ClassListData;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Summons/MerchantGolem/GolemTrader.java b/src/main/java/com/l2jserver/datapack/ai/npc/Summons/MerchantGolem/GolemTrader.java
index 7ba99affd7e93e06b2d5766493ecc84c98bd1d21..87b9e6d7b4f9df33b1453dc190e85c4118c87be5 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Summons/MerchantGolem/GolemTrader.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Summons/MerchantGolem/GolemTrader.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Summons.MerchantGolem;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
/**
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/BabyPets.java b/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/BabyPets.java
index ad4d616b7a70144fe0408efb6df9cbfa4305a604..f2b5676e22c158f01a2088d86dfa2d1311a24ed6 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/BabyPets.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/BabyPets.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.npc.Summons.Pets;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -32,8 +33,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Baby Pets AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/ImprovedBabyPets.java b/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/ImprovedBabyPets.java
index 4a5d65de0e284a6252a90442b33c4b586c4259a9..6b2fe8d91ba494a024a40cea7c48437f94750780 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/ImprovedBabyPets.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Summons/Pets/ImprovedBabyPets.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.npc.Summons.Pets;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
@@ -34,8 +35,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Improved Baby Pets AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java b/src/main/java/com/l2jserver/datapack/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
index fc9b8f009f2879f5946afd5e2070614712af1745..cdab20adbebf083880988828c5e7048653463f5e 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.SupportUnitCaptain;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.ClanPrivilege;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/SymbolMaker/SymbolMaker.java b/src/main/java/com/l2jserver/datapack/ai/npc/SymbolMaker/SymbolMaker.java
index b367c3ff749a1368a64f0c040cb196b09fa90c32..a8244a1ab6df670a841a2fbe747866912ce19d18 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/SymbolMaker/SymbolMaker.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/SymbolMaker/SymbolMaker.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.SymbolMaker;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.HennaEquipList;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Asher/Asher.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Asher/Asher.java
index cd12422202c98638a9d15a193aec7542eb9d57ec..310e64237e3397ca28fb13e844aa0f4f365ee6fa 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Asher/Asher.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Asher/Asher.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.npc.Teleports.Asher;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Asher AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/CrumaTower/CrumaTower.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/CrumaTower/CrumaTower.java
index e6e25de1fc832ed9bff4b8923cfbd5094f41fce1..38c8913d4166def7ee17085a1d0a17e40fc3cce0 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/CrumaTower/CrumaTower.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/CrumaTower/CrumaTower.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.CrumaTower;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
index cb6274469147aae75a94d335f17896ae9c4b8288..f0f740a0e6fb518b7b5cc86b62c31fc877c755a5 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.instancemanager.TownManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
index 2f4623bd8bef166dd79a32fa419d03463065cff5..d3c339a23f9bf04e8e0d3dbb2a2dfb89cec6abe7 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java
@@ -18,12 +18,11 @@
*/
package com.l2jserver.datapack.ai.npc.Teleports.ElrokiTeleporters;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Elroki teleport AI.
* @author Plim
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
index 06c3cd29138f4d53dca9560bf1daf42ce31721dc..9085de34a921845e8e0ace6f526106d411bc21d7 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GatekeeperSpirit/GatekeeperSpirit.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.GatekeeperSpirit;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GhostChamberlainOfElmoreden/GhostChamberlainOfElmoreden.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GhostChamberlainOfElmoreden/GhostChamberlainOfElmoreden.java
index 668aa7d3784a1f69dfb73bbdba76a58d64194591..86c9b93864126e78c06d6d85e6c69044b538cb9e 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GhostChamberlainOfElmoreden/GhostChamberlainOfElmoreden.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GhostChamberlainOfElmoreden/GhostChamberlainOfElmoreden.java
@@ -18,12 +18,11 @@
*/
package com.l2jserver.datapack.ai.npc.Teleports.GhostChamberlainOfElmoreden;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Ghost Chamberlain of Elmoreden AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
index 2093a4be9381e5467029e302ad38be7c15b2a5c9..9c045e828ac7e834c0df0b1c3ef9a50c22188442 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java
@@ -20,7 +20,6 @@ package com.l2jserver.datapack.ai.npc.Teleports.GrandBossTeleporters;
import com.l2jserver.datapack.ai.individual.Valakas;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java
index 4ab78058dff99cdbf5cd3efec493fdf34904cd55..48b4e80afb17a6afe0189a15d67517b7627767d2 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.HuntingGroundsTeleport;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Klemis/Klemis.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Klemis/Klemis.java
index af517efdbbc7498765a7ebfa8c7e459314002324..a2dae936acbad2ba192655eec8481cc5cee01812 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Klemis/Klemis.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Klemis/Klemis.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.Klemis;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
index 41baa55a15674a9cfc6cf0509e1a9331649f65e4..1cdc4b246cf5309926ad55a1db575754e106b3be 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.MithrilMinesTeleporter;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NewbieGuide/NewbieGuide.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NewbieGuide/NewbieGuide.java
index a09edaf68911e6da26d6eea59f5c330f3b2605cf..98054c41a50f7930dd188ed988f2e9e75486ad7c 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NewbieGuide/NewbieGuide.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NewbieGuide/NewbieGuide.java
@@ -23,6 +23,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.quests.Q00255_Tutorial.Q00255_Tutorial;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.enums.audio.Voice;
@@ -35,9 +37,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.NpcStringId;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.quests.Q00255_Tutorial.Q00255_Tutorial;
-
/**
* Class handle all newbie guide tasks
* @author Zealar
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
index 2004ebc961088473387601851594440b505be271..04d8d227385d28be7b29d516ece0f0826d70fe9e 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.NoblesseTeleport;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/OracleTeleport/OracleTeleport.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
index 4742661566c04683cb22dabee39e33c8ac9f239d..efb394f1c58a419fb070ac08cc0b3302bf85662c 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/OracleTeleport/OracleTeleport.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.ai.npc.Teleports.OracleTeleport;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -28,8 +29,6 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Oracle teleport AI.
* @author Charus
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
index 16cf6740089fc144b473f641a273f7ed9de0b9d6..12eb4dc0d756462d978b427d41a30802cdb533f6 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
index bcc828070d00cdb0ff40039663d30dba2670a818..19ae6328f4d13d0c7cb49964cd673ac53f24b3af 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java
@@ -21,12 +21,11 @@ package com.l2jserver.datapack.ai.npc.Teleports.SeparatedSoul;
import java.util.HashMap;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Separated Soul teleport AI.
* @author UnAfraid, improved by Adry_85, Zealar
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
index 5dd791bc42229ff833f356f5e974a8cdea0b056f..8f1ab56074c30b5dd4de3a067bc87bf584757155 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.ai.npc.Teleports.StakatoNestTeleporter;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust;
-
/**
* Stakato Nest Teleport AI.
* @author Charus
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
index dd766d32a8d29bc87a5dbaac7a1f8d7ed0d4a4fe..31290c66a7598f38dd1fa9b5f243552d1f3e6524 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.SteelCitadelTeleport;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
index acc399a74b911df1fbee04401a706d5434b92e84..0bd3871c9b98fe63520d7e60ec6f168fea029366 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.StrongholdsTeleports;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Survivor/Survivor.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Survivor/Survivor.java
index 394895d8cfd13ae49ccd7613c4611f1a24c5c3a2..659b10305d13d443638cd05d920ec706044bfd09 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Survivor/Survivor.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/Survivor/Survivor.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.Survivor;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
index 41832d12222de159e3bb475a31b7f5c22f3ab625..79d3207735c776d508882ef8aa6c1a1d858c7fdc 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
index b7ea66d5ef451ae40858bcc261515fd51b305154..c7eff6faae3d39315145bc57e512f22bd35d728f 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
index 62e739b3d72f44d15c1985fc780077e0d4318a79..c5099da39c547fe3e62480b7aab6427d5697a560 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.TeleportToUndergroundColiseum;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
index 86e97f3c6011a1bef754e67e12984a8fe8659378..b15fdca6e805d9a435456d9c028dd7b0d9688041 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.Teleports.TeleportWithCharm;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ToIVortex/ToIVortex.java b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ToIVortex/ToIVortex.java
index dc5bad7f22c777f29bfcae0951187817b1b54a31..7ef7bf32ab0d90f85af984927eab5c2a479a424a 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ToIVortex/ToIVortex.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Teleports/ToIVortex/ToIVortex.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java b/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java
index 9ad3342f3b181e3b50e3ea673f9eea739a5f02be..f5a2ed17a700705e6ec2494da489420fe7c09488 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/TerritoryManagers/TerritoryManagers.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.TerritoryManagers;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.instancemanager.CastleManager;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/TownPets/TownPets.java b/src/main/java/com/l2jserver/datapack/ai/npc/TownPets/TownPets.java
index 013bca14046e84678a51d64645a07067795137e7..a25b710604ef4aebd369b33a450395eb61fc40e2 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/TownPets/TownPets.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/TownPets/TownPets.java
@@ -19,9 +19,8 @@
package com.l2jserver.datapack.ai.npc.TownPets;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/Trainers/HealerTrainer/HealerTrainer.java b/src/main/java/com/l2jserver/datapack/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
index f438845784316930c13283daa3a18c2222b5a375..55cfd9e133e492eddd47ac1daeca80cd470b5712 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/Trainers/HealerTrainer/HealerTrainer.java
@@ -21,7 +21,6 @@ package com.l2jserver.datapack.ai.npc.Trainers.HealerTrainer;
import java.util.Collection;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
import com.l2jserver.gameserver.datatables.SkillData;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java b/src/main/java/com/l2jserver/datapack/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
index efc07acbeab55df445d717628ea68f4af1bc7860..7ed3abbc8d6c1720a1feebf8303b9d6f9370db67 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java b/src/main/java/com/l2jserver/datapack/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
index 9efb57d45f7f2a50b189d73eabddfadd5481c28f..f995bb62a50097255f90ee959cf67fc8a4cd6693 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java
@@ -22,7 +22,6 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/WeaverOlf/WeaverOlf.java b/src/main/java/com/l2jserver/datapack/ai/npc/WeaverOlf/WeaverOlf.java
index 072dc3f91521799abd8440f5ce1cd4b65f1af7a8..3e9a8cddc9d9ac515638d5004a5fe0ed9d3974f2 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/WeaverOlf/WeaverOlf.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/WeaverOlf/WeaverOlf.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.ai.npc.WeaverOlf;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
diff --git a/src/main/java/com/l2jserver/datapack/ai/npc/WyvernManager/WyvernManager.java b/src/main/java/com/l2jserver/datapack/ai/npc/WyvernManager/WyvernManager.java
index 83aeaec5454a43e6657e5f046e81f7f9560c3dd2..7e45101f7136dac81feb0529d09dd0c1c5352145 100644
--- a/src/main/java/com/l2jserver/datapack/ai/npc/WyvernManager/WyvernManager.java
+++ b/src/main/java/com/l2jserver/datapack/ai/npc/WyvernManager/WyvernManager.java
@@ -22,9 +22,8 @@ import java.util.HashMap;
import java.util.Map;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Fort;
diff --git a/src/main/java/com/l2jserver/datapack/custom/events/Elpies/Elpies.java b/src/main/java/com/l2jserver/datapack/custom/events/Elpies/Elpies.java
index 9b8aabdad5e2a54464b1bac55ed99777bcfbe54c..89ba6163bb6da232c9eec6a1656e44d9265f1b60 100644
--- a/src/main/java/com/l2jserver/datapack/custom/events/Elpies/Elpies.java
+++ b/src/main/java/com/l2jserver/datapack/custom/events/Elpies/Elpies.java
@@ -22,8 +22,8 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2EventMonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/custom/events/Race/Race.java b/src/main/java/com/l2jserver/datapack/custom/events/Race/Race.java
index 2b2fcd63c7c16e150f67c7322ba474ad8cb62a57..01706989a667ddef9ba21461dcf76add289a5adf 100644
--- a/src/main/java/com/l2jserver/datapack/custom/events/Race/Race.java
+++ b/src/main/java/com/l2jserver/datapack/custom/events/Race/Race.java
@@ -22,8 +22,8 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/custom/events/TvT/TvTManager/TvTManager.java b/src/main/java/com/l2jserver/datapack/custom/events/TvT/TvTManager/TvTManager.java
index b6c28a682fe23346e74597446f763e919514f7d2..e3e658262e2c53c7fd87ca1592d7401f90144a59 100644
--- a/src/main/java/com/l2jserver/datapack/custom/events/TvT/TvTManager/TvTManager.java
+++ b/src/main/java/com/l2jserver/datapack/custom/events/TvT/TvTManager/TvTManager.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.custom.events.TvT.TvTManager;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
import com.l2jserver.gameserver.handler.VoicedCommandHandler;
diff --git a/src/main/java/com/l2jserver/datapack/custom/events/Wedding/Wedding.java b/src/main/java/com/l2jserver/datapack/custom/events/Wedding/Wedding.java
index 82049cf64249ff1120b6c74a5bef623d5ea977e1..d4c62ce1ab1edc9fffaa50115d4adee9b1ae713c 100644
--- a/src/main/java/com/l2jserver/datapack/custom/events/Wedding/Wedding.java
+++ b/src/main/java/com/l2jserver/datapack/custom/events/Wedding/Wedding.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.custom.events.Wedding;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.instancemanager.CoupleManager;
import com.l2jserver.gameserver.model.L2World;
diff --git a/src/main/java/com/l2jserver/datapack/custom/listeners/ListenerTest.java b/src/main/java/com/l2jserver/datapack/custom/listeners/ListenerTest.java
index ed4c7565a0bc486f00dc13c65af302501582e07a..fbf91b79a49dbf4b565e1cad6210973545a91866 100644
--- a/src/main/java/com/l2jserver/datapack/custom/listeners/ListenerTest.java
+++ b/src/main/java/com/l2jserver/datapack/custom/listeners/ListenerTest.java
@@ -21,7 +21,6 @@ package com.l2jserver.datapack.custom.listeners;
import java.util.logging.Level;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.events.Containers;
import com.l2jserver.gameserver.model.events.EventType;
@@ -41,7 +40,6 @@ import com.l2jserver.gameserver.model.events.impl.sieges.castle.OnCastleSiegeSta
import com.l2jserver.gameserver.model.events.listeners.ConsumerEventListener;
import com.l2jserver.gameserver.model.events.returns.TerminateReturn;
import com.l2jserver.gameserver.model.holders.ItemHolder;
-import com.l2jserver.util.Rnd;
/**
* An example usage of Listeners.
@@ -133,7 +131,7 @@ public class ListenerTest extends AbstractNpcAI
public void OnCreatureKill(OnCreatureKill event)
{
// 70% chance to drop
- if (Rnd.get(100) >= 70)
+ if (getRandom(100) >= 70)
{
return;
}
@@ -142,7 +140,7 @@ public class ListenerTest extends AbstractNpcAI
if ((event.getAttacker() != null) && event.getAttacker().isPlayable() && event.getTarget().isAttackable())
{
final L2Attackable monster = (L2Attackable) event.getTarget();
- monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, Rnd.get(100, 1000)));
+ monster.dropItem(event.getAttacker().getActingPlayer(), new ItemHolder(57, getRandom(100, 1000)));
}
}
diff --git a/src/main/java/com/l2jserver/datapack/features/SkillTransfer/SkillTransfer.java b/src/main/java/com/l2jserver/datapack/features/SkillTransfer/SkillTransfer.java
index d72cf098ed44097c163ff5bbb070e1bddd297d8b..0e4a97f3441d126ec2deadcadfdc0f0d77bcdc09 100644
--- a/src/main/java/com/l2jserver/datapack/features/SkillTransfer/SkillTransfer.java
+++ b/src/main/java/com/l2jserver/datapack/features/SkillTransfer/SkillTransfer.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.features.SkillTransfer;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.ClassListData;
import com.l2jserver.gameserver.data.xml.impl.SkillTreesData;
@@ -33,8 +34,6 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Skill Transfer feature.
* @author Zoey76
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/EnergySeeds.java b/src/main/java/com/l2jserver/datapack/gracia/AI/EnergySeeds.java
index 42ea9033463b1f484262af1d08c7763f0c783b7a..29b3ea877e225d9726fcd0ad406aba9ca98cadb8 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/EnergySeeds.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/EnergySeeds.java
@@ -24,9 +24,9 @@ import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.datapack.quests.Q00692_HowtoOpposeEvil.Q00692_HowtoOpposeEvil;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.enums.audio.Sound;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/Lindvior.java b/src/main/java/com/l2jserver/datapack/gracia/AI/Lindvior.java
index b233be7e25ef8b310e1e2d92d19c2ec067e69723..8fad8ff3ea9cf89586a0897f28d5dcd330fcf029 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/Lindvior.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/Lindvior.java
@@ -22,7 +22,6 @@ import java.util.Calendar;
import java.util.GregorianCalendar;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.datatables.SpawnTable;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/Maguen.java b/src/main/java/com/l2jserver/datapack/gracia/AI/Maguen.java
index 801cee96647bd01c0ce99267b33a5cdd09deb74c..5bbf1ed4a69d3186c38da95253738921bf095d6b 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/Maguen.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/Maguen.java
@@ -18,6 +18,8 @@
*/
package com.l2jserver.datapack.gracia.AI;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.gracia.AI.NPC.Nemo.Nemo;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.instancemanager.QuestManager;
import com.l2jserver.gameserver.model.L2Object;
@@ -29,9 +31,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.NpcStringId;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.gracia.AI.NPC.Nemo.Nemo;
-
/**
* Maguen AI.
* @author St3eT
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/FortuneTelling/FortuneTelling.java b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
index 7843627ad8de6a309eaf1439fefa29023c4938e3..25acfa01e25af8360a13bda61c1fea1c68980c57 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/FortuneTelling/FortuneTelling.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.gracia.AI.NPC.FortuneTelling;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.itemcontainer.Inventory;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/GeneralDilios/GeneralDilios.java b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
index 4baac93a5d53ffecf25be718166d5e1f3e5f3b51..19f3667f764f43e322e548b43957a0a401b172a8 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/GeneralDilios/GeneralDilios.java
@@ -23,7 +23,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Lekon/Lekon.java b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Lekon/Lekon.java
index de2f00712f3bf6139a00e0f14eace8969395a6bc..88afc9462cfa96481c729d675c5614faa34175c2 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Lekon/Lekon.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Lekon/Lekon.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.gracia.AI.NPC.Lekon;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.instancemanager.AirShipManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Seyo/Seyo.java b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Seyo/Seyo.java
index 9f072f4a9f128dbdb87add1b32948b32c9cd3004..1f8750d17fc5c97c7ec5b7d6303937764f5f468c 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Seyo/Seyo.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/Seyo/Seyo.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.gracia.AI.NPC.Seyo;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.NpcStringId;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
index 5c9a49d99f28682058a65a7b8c0c17eb30e23e4c..b7aabc1f74632650a89c974a630bab6191a81436 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/NPC/ZealotOfShilen/ZealotOfShilen.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.gracia.AI.NPC.ZealotOfShilen;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/src/main/java/com/l2jserver/datapack/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
index 0c2985ca01dca92a2f28fb222c4b3ea424ebff7a..b6bc9911fe2700f53129e866e8a8d3b76cd0ce78 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java
@@ -22,6 +22,7 @@ import java.util.Calendar;
import java.util.HashMap;
import java.util.Map;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -33,8 +34,6 @@ import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.model.zone.type.L2EffectZone;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Seed Of Annihilation AI.
* @author Gigiikun
diff --git a/src/main/java/com/l2jserver/datapack/gracia/AI/StarStones.java b/src/main/java/com/l2jserver/datapack/gracia/AI/StarStones.java
index ffecfbabe5f785eaaeed6ce3b290d689c0a15f08..8e76aa0c145b57786f511e261b542493929663f7 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/AI/StarStones.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/AI/StarStones.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.gracia.AI;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfDestruction/Stage1.java b/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfDestruction/Stage1.java
index 33dc740c037fbb094c28733388f487bff35fa01a..a09bd31627e087cbb03fd6e1531bc531ef883255 100644
--- a/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfDestruction/Stage1.java
+++ b/src/main/java/com/l2jserver/datapack/gracia/instances/SeedOfDestruction/Stage1.java
@@ -33,10 +33,10 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.datapack.instances.AbstractInstance;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.enums.TrapAction;
import com.l2jserver.gameserver.instancemanager.GraciaSeedsManager;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/actionhandlers/L2NpcAction.java b/src/main/java/com/l2jserver/datapack/handlers/actionhandlers/L2NpcAction.java
index 9d9a28839b1c98c7f2a52a20b80550f77a45407f..dddd5a7c61128720bae430d2e70e9cd06ebdbf17 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/actionhandlers/L2NpcAction.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/actionhandlers/L2NpcAction.java
@@ -18,9 +18,10 @@
*/
package com.l2jserver.datapack.handlers.actionhandlers;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.handler.IActionHandler;
import com.l2jserver.gameserver.model.L2Object;
@@ -32,7 +33,6 @@ import com.l2jserver.gameserver.model.events.EventDispatcher;
import com.l2jserver.gameserver.model.events.EventType;
import com.l2jserver.gameserver.model.events.impl.character.npc.OnNpcFirstTalk;
import com.l2jserver.gameserver.network.serverpackets.MoveToPawn;
-import com.l2jserver.util.Rnd;
public class L2NpcAction implements IActionHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2ItemInstanceActionShift.java b/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2ItemInstanceActionShift.java
index 9ebd75abbb1e1a7a7148ff5ab932d2a9f3798998..13a01ae8f17295d20caa591da3ead81872251024 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2ItemInstanceActionShift.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2ItemInstanceActionShift.java
@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class L2ItemInstanceActionShift implements IActionShiftHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java b/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java
index e1bfe5f49f4e5fcafd5256380bd9100562fd63e7..e451c6f2a6c5e9cb4a78e2e4a26ceed57fa39386 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/actionshifthandlers/L2StaticObjectInstanceActionShift.java
@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.StaticObject;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class L2StaticObjectInstanceActionShift implements IActionShiftHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminAnnouncements.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminAnnouncements.java
index a98481c44a6b173db311440c7c6ed7ef00fc4311..706e67ba172b38459436b244e6352bbc2d93f99d 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminAnnouncements.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminAnnouncements.java
@@ -20,8 +20,8 @@ package com.l2jserver.datapack.handlers.admincommandhandlers;
import java.util.StringTokenizer;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.sql.impl.AnnouncementsTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.PageResult;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminBuffs.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminBuffs.java
index dee4f125e439cf44b06e873a0ef40d281a2e15a8..381092d8bf9ec8628a49b4f2bdd1cd7af2bf784b 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminBuffs.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminBuffs.java
@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.SkillCoolTime;
import com.l2jserver.gameserver.util.GMAudit;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class AdminBuffs implements IAdminCommandHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminCursedWeapons.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminCursedWeapons.java
index 8d982c81b72cb003c29972fc500d58ba3b4c38a0..f97e0cfe12c27260b7ec162ad52baa8bd427dc5c 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminCursedWeapons.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminCursedWeapons.java
@@ -28,7 +28,7 @@ import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* This class handles following admin commands: - cw_info = displays cursed weapon status - cw_remove = removes a cursed weapon from the world, item id or name must be provided - cw_add = adds a cursed weapon into the world, item id or name must be provided. Target will be the weilder - cw_goto =
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java
index e24504c9bb612abe83400f87f0a95b0d3dc73d58..e2d5dad64da8e79bfccf8396329b5bdad845f00e 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEditChar.java
@@ -55,8 +55,8 @@ import com.l2jserver.gameserver.network.serverpackets.PartySmallWindowDeleteAll;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
import com.l2jserver.gameserver.util.HtmlUtil;
+import com.l2jserver.gameserver.util.StringUtil;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.StringUtil;
/**
* EditChar admin command implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEventEngine.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEventEngine.java
index 2ff52864c6c164eb47feddd74a77ccdbd38db33d..989deb662b8a0c3fd90c0c39bd0e0dffa6409ac2 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEventEngine.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEventEngine.java
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
import java.io.PrintStream;
import java.util.StringTokenizer;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.data.xml.impl.TransformData;
@@ -41,8 +42,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.PlaySound;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
import com.l2jserver.gameserver.util.Broadcast;
-import com.l2jserver.util.Rnd;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* This class handles following admin commands: - admin = shows menu
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEvents.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEvents.java
index 7147c87307780c0f2ce2477d3b9776ab46c3dc69..cb27371cc0113039173b3068082fa7e42840f789 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEvents.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminEvents.java
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Event;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class AdminEvents implements IAdminCommandHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFightCalculator.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFightCalculator.java
index f27ead06c1cabad525a7064fd1b0f664e1b60e5f..4c99b39bb0cea38f8cbd513ab15dde34ce1bc0f1 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFightCalculator.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFightCalculator.java
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* This class handles following admin commands: - gm = turns gm mode on/off
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFortSiege.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFortSiege.java
index 7183aa649eeffd1297a7d2092af252c8328496d2..823776bc9dfa246893b05cfbcc77dcbdc16db3fd 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFortSiege.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminFortSiege.java
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.entity.Fort;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* This class handles all siege commands: Todo: change the class name, and neaten it up
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminHtml.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminHtml.java
index 6af8bda0a7e6b67e58be34a74ff7e58315867570..4ca27fa6e355821323c0b44fdb5e649bdd78219c 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminHtml.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminHtml.java
@@ -21,8 +21,8 @@ package com.l2jserver.datapack.handlers.admincommandhandlers;
import java.io.File;
import java.util.StringTokenizer;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminInstanceZone.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminInstanceZone.java
index 36e72b27691b0117d62f387939b0df6ec1391e91..f1ad37249966c29cf4386cbfebfc6e1e51adc17a 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminInstanceZone.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminInstanceZone.java
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.util.GMAudit;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class AdminInstanceZone implements IAdminCommandHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminLogin.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminLogin.java
index 01308eb26cf4d50e233d20b7304f160aa3b99837..1cc4dc895935f321be8ba6638fa188c598b80b61 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminLogin.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminLogin.java
@@ -20,8 +20,8 @@ package com.l2jserver.datapack.handlers.admincommandhandlers;
import java.util.StringTokenizer;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.LoginServerThread;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.gameserverpackets.ServerStatus;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminManor.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminManor.java
index 8526408ecb8e7c1d7dd31fa96af2f47a1a8d8ba9..6435acc12dde6cd7b6402b6d4d292f1f6810af31 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminManor.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminManor.java
@@ -24,8 +24,8 @@ import com.l2jserver.gameserver.instancemanager.CastleManorManager;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Castle;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.util.StringUtil;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.StringUtil;
/**
* @author malyelfik
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminPunishment.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminPunishment.java
index 0cf6d4974cbc0a0a9b800114a27e9672ce1cd1db..989126101bff67fd3eeb41d1738deb42a6543c14 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminPunishment.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminPunishment.java
@@ -26,8 +26,8 @@ import java.util.StringTokenizer;
import java.util.logging.Level;
import java.util.logging.Logger;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.sql.impl.CharNameTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.instancemanager.PunishmentManager;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminReload.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminReload.java
index 75a0255cc1c4c2f08f303e3f41d882d4b8fb4245..a934b15f158ca0d15dc7bca6464f5ef83f3b68b2 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminReload.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminReload.java
@@ -21,8 +21,8 @@ package com.l2jserver.datapack.handlers.admincommandhandlers;
import java.io.File;
import java.util.StringTokenizer;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.cache.HtmCache;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.data.sql.impl.TeleportLocationTable;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSiege.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSiege.java
index 0510282924c837aa67826d1c624a2daf26820ea4..a2b7a8d4bfc128957a3558fb6d6a0b14df470190 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSiege.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSiege.java
@@ -25,9 +25,9 @@ import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.data.sql.impl.ClanTable;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.instancemanager.AuctionManager;
-import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
import com.l2jserver.gameserver.instancemanager.CastleManager;
import com.l2jserver.gameserver.instancemanager.ClanHallManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Castle;
@@ -36,8 +36,8 @@ import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
+import com.l2jserver.gameserver.util.StringUtil;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.StringUtil;
/**
* This class handles all siege commands.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSkill.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSkill.java
index a2a8018bde2810d3e637fab005d9291936bfa3ee..abd0696a88a6c981baeb5ce31823a9eaf3f37805 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSkill.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSkill.java
@@ -37,7 +37,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.PledgeSkillList;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* This class handles following admin commands:
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSpawn.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSpawn.java
index b1a2d64c74fc7bc9fec3722d6592544b3960d4b4..2fef5e50e871f6f8efb32baa4567f017627ab16b 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSpawn.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminSpawn.java
@@ -25,8 +25,8 @@ import java.util.logging.Logger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.SevenSigns;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.AdminData;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.datatables.SpawnTable;
@@ -47,7 +47,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* This class handles following admin commands: - show_spawns = shows menu - spawn_index lvl = shows menu for monsters with respective level - spawn_monster id = spawns monster id on target
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTeleport.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTeleport.java
index 2d67fb2ea2c810c5656ac38a71f356f715e1c6e8..ca1bc2f7f989cfcf99f875b5279665f4137d7710 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTeleport.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTeleport.java
@@ -42,7 +42,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* This class handles following admin commands: - show_moves - show_teleport - teleport_to_character - move_to - teleport_character
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTest.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTest.java
index 10d2220eb9464426f322514daaf8d5142c589f05..0506bea428864fc20fdf3c4c112ad8c9be78bbd2 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTest.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminTest.java
@@ -21,8 +21,8 @@ package com.l2jserver.datapack.handlers.admincommandhandlers;
import java.util.NoSuchElementException;
import java.util.StringTokenizer;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.handler.IAdminCommandHandler;
import com.l2jserver.gameserver.model.L2Object;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminZone.java b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminZone.java
index cadb599b1898832934dc47559ba6120883dc8f30..915d09c4cd592fcfcd69617f775d89d25adf14aa 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminZone.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/admincommandhandlers/AdminZone.java
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.model.zone.L2ZoneType;
import com.l2jserver.gameserver.model.zone.ZoneId;
import com.l2jserver.gameserver.model.zone.type.NpcSpawnTerritory;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* Small typo fix by Zoey76 24/02/2011
diff --git a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java
index c79a26229ef82fe97778aca028b760c934f5089c..f6ac5bb750e2e07bfcc7a7d9fa0ece5785e047aa 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/Festival.java
@@ -22,9 +22,9 @@ import java.util.Calendar;
import java.util.List;
import java.util.logging.Level;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.SevenSigns;
import com.l2jserver.gameserver.SevenSignsFestival;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IBypassHandler;
import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.L2Party.messageType;
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class Festival implements IBypassHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java
index 1e4938a1ab392e0608827ad19062a8dfceffc17f..c1af57124612a0fcc72ad2572491cdd06a17e42d 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/bypasshandlers/QuestLink.java
@@ -39,7 +39,7 @@ import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class QuestLink implements IBypassHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/communityboard/ClanBoard.java b/src/main/java/com/l2jserver/datapack/handlers/communityboard/ClanBoard.java
index b1c92525f29313176be76306207944ca404aa319..5112ef29ee45a44cb5fb4f01e83306c20ad850d9 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/communityboard/ClanBoard.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/communityboard/ClanBoard.java
@@ -24,8 +24,8 @@ import com.l2jserver.gameserver.handler.IWriteBoardHandler;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.util.StringUtil;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.StringUtil;
/**
* Clan board.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/custom/OpenDoor.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/custom/OpenDoor.java
index 9b46a3a3109578490640fcfcd208d92d8d7b07ea..97294da7cab77a28195d29ac605750f69abaf3b8 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/custom/OpenDoor.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/custom/OpenDoor.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.custom;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -27,7 +28,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.entity.Instance;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.util.Rnd;
/**
* Open Door effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Confuse.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Confuse.java
index 2e7577fcf3d291e83e9bf0194e1a221a7b63e3d5..4dc0a68f431b70904f3cb9401e9b005deea5cc84 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Confuse.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Confuse.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.handlers.effecthandlers.instant;
import java.util.ArrayList;
import java.util.List;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.ai.CtrlEvent;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.L2Object;
@@ -31,7 +32,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.EffectFlag;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.stats.Formulas;
-import com.l2jserver.util.Rnd;
/**
* Confuse effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DeathLink.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DeathLink.java
index c2160eb973bdfff7ab12ae5052c1bf975c1f3559..9c21de8092222d607c5f8c1521b5ed98e5b98372 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DeathLink.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DeathLink.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.enums.ShotType;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -28,7 +29,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
-import com.l2jserver.util.Rnd;
/**
* Death Link effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DispelBySlotProbability.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DispelBySlotProbability.java
index b65aac0609953d1c8ccfe59aa5b1c3752cd6f802..67acc6aed4873522d3935ac8f3cad752d31a4223 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DispelBySlotProbability.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/DispelBySlotProbability.java
@@ -23,6 +23,7 @@ import java.util.EnumMap;
import java.util.Map;
import java.util.Map.Entry;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.model.CharEffectList;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -31,7 +32,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.AbnormalType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.util.Rnd;
/**
* Dispel By Slot Probability effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Fishing.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Fishing.java
index 244965b6eded1793cdd11d1091d13d2f05dafff6..99265ca4bc9ceb2e3e1c33ad52b2bd6427573300 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Fishing.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Fishing.java
@@ -18,8 +18,9 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
-import com.l2jserver.gameserver.config.Config;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.GeoData;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.StatsSet;
@@ -40,7 +41,6 @@ import com.l2jserver.gameserver.model.zone.type.L2FishingZone;
import com.l2jserver.gameserver.model.zone.type.L2WaterZone;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Fishing effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Harvesting.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Harvesting.java
index 708cc25bb13317bca66178435c2388acf6ab4c7a..88eb241ca4253095ce0e17ea546990af78d20f63 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Harvesting.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Harvesting.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,7 +28,6 @@ import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.Rnd;
/**
* Harvesting effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/HeadquarterCreate.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/HeadquarterCreate.java
index f98da610687f1b01719158e36c716e69ce8da279..b53150c8f38e070c0f032d1e037c6bf86f9227d6 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/HeadquarterCreate.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/HeadquarterCreate.java
@@ -19,8 +19,8 @@
package com.l2jserver.datapack.handlers.effecthandlers.instant;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
-import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
import com.l2jserver.gameserver.instancemanager.CastleManager;
+import com.l2jserver.gameserver.instancemanager.ClanHallSiegeManager;
import com.l2jserver.gameserver.instancemanager.FortManager;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Lethal.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Lethal.java
index 3e0cc926370b477420c9b48256b8893eba90bff8..7d6a56bc38654c3bcd565cb7a4f5f5c71400141b 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Lethal.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Lethal.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.conditions.Condition;
@@ -26,7 +27,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.util.Rnd;
/**
* Lethal effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttack.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttack.java
index 8aba6b85020cabd836c7e767c01e309ab36d8b65..16c612cebd0eaf9fcc62ae8373809ec11bc8a92c 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttack.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttack.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.enums.ShotType;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -28,7 +29,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
-import com.l2jserver.util.Rnd;
/**
* Magical Attack effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttackByAbnormal.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttackByAbnormal.java
index 1e1a6be83150de5365ea0f766d700df2c8e22205..fc89911c8624b349610268c959aad5a3d31d615b 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttackByAbnormal.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalAttackByAbnormal.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.enums.ShotType;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -28,7 +29,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
-import com.l2jserver.util.Rnd;
/**
* Magical Attack By Abnormal effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalSoulAttack.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalSoulAttack.java
index c7c9720d2165784f50805f4f53e0a0cf79b1c307..40140d7a1332957e90531c331f6650ccd1808608 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalSoulAttack.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/MagicalSoulAttack.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.enums.ShotType;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -28,7 +29,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
-import com.l2jserver.util.Rnd;
/**
* Magical Soul Attack effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RandomizeHate.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RandomizeHate.java
index aba890582ae8bd8a36098fd10c3bc9b4c18248c2..9a57488e9035e6c3ff486a73b39d68aa1cf7c7e6 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RandomizeHate.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RandomizeHate.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.handlers.effecthandlers.instant;
import java.util.List;
import java.util.stream.Collectors;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
@@ -28,7 +29,6 @@ import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.stats.Formulas;
-import com.l2jserver.util.Rnd;
/**
* Randomize Hate effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RestorationRandom.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RestorationRandom.java
index a6eaae1f2c21fe411105ae0442d0f7101a81144c..5449be62b237966ea0d003b73f960322617c2377 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RestorationRandom.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RestorationRandom.java
@@ -21,6 +21,7 @@ package com.l2jserver.datapack.handlers.effecthandlers.instant;
import java.util.ArrayList;
import java.util.List;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.L2ExtractableProductItem;
import com.l2jserver.gameserver.model.L2ExtractableSkill;
@@ -31,7 +32,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.holders.ItemHolder;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.util.Rnd;
/**
* Restoration Random effect implementation.<br>
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RunAway.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RunAway.java
index fcd3a84b1dd402d1545c8e2221d7210d03167513..350fe1762214696442103b83909988c0cef6d585 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RunAway.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/RunAway.java
@@ -18,13 +18,13 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.ai.CtrlEvent;
import com.l2jserver.gameserver.ai.L2AttackableAI;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.util.Rnd;
/**
* Run Away effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Sow.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Sow.java
index abb2ad1b9f5cfbd883a9e0c4ddc0a4c61afb2a56..1a4bfeef06b950b6a7c22fdf4b9b8e7124b004b5 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Sow.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Sow.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.L2Seed;
@@ -30,7 +31,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.Rnd;
/**
* Sow effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonCubic.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonCubic.java
index 58da7c49ec20c1f431f1af63f69415ede237a8e4..8e6fb742f4f2a2b3f9711e6667ca12a3aa6dc7ce 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonCubic.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonCubic.java
@@ -18,13 +18,13 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.instance.L2CubicInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.util.Rnd;
/**
* Summon Cubic effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java
index 1ffcd0ec89cb7ffde446002a3f06fc1f9328fa83..a9730f86c66cd7673e9cb99da7b75cb874143cb5 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/SummonNpc.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.data.xml.impl.NpcData;
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.Location;
@@ -32,7 +33,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
-import com.l2jserver.util.Rnd;
/**
* Summon Npc effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Unsummon.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Unsummon.java
index d27df901cd4e6681ca773226265fd9feca618dbb..fb4065db748a46ced34db412a2414c9fb7ad18f4 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Unsummon.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/instant/Unsummon.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.instant;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.model.StatsSet;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -26,7 +27,6 @@ import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.util.Rnd;
/**
* Unsummon effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java
index 9a3ccee646e17b1f759a363de9706b7e5478079e..31d1d0ed06c9f85a8ff80d2b86139a4329225bdf 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAttack.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.pump;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.handler.TargetHandler;
@@ -35,7 +36,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Trigger Skill By Attack effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java
index b1ca3b1b272a4468381f33658cd40630a3d04a3b..b105926836d9cbab9eadb58051e9f70b5cd7cc6c 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByAvoid.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.pump;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.handler.TargetHandler;
import com.l2jserver.gameserver.model.L2Object;
@@ -33,7 +34,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Trigger Skill By Avoid effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java
index cb33e5b6283ca7edbe5420ea0957875c24103487..bf0c92cebb4f3f7d3914b044e94bbeb79ce1d3e5 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillByDamage.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.pump;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.handler.TargetHandler;
@@ -34,7 +35,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Trigger Skill By Damage effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java
index a4cd447c8f9485b09ad62c767d4231ce84b2cbeb..783567630ff0b40a0ace8e2b4a06f5dbbd8448e0 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/effecthandlers/pump/TriggerSkillBySkill.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.effecthandlers.pump;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.handler.TargetHandler;
import com.l2jserver.gameserver.model.L2Object;
@@ -32,7 +33,6 @@ import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
-import com.l2jserver.util.Rnd;
/**
* Trigger Skill By Skill effect implementation.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/ExtractableItems.java b/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/ExtractableItems.java
index 2d0c9b7613ab72e1ba64659a6db735bdabb746e0..003f497d7261078d889a0cb8d78252e3850e3376 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/ExtractableItems.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/ExtractableItems.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.handlers.itemhandlers;
import java.util.List;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.model.L2ExtractableProduct;
@@ -28,7 +29,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.items.L2EtcItem;
import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.util.Rnd;
/**
* Extractable Items handler.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/RollingDice.java b/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/RollingDice.java
index 3f1c1ae633349c7fd902337f8a9ed1e17f7e9c67..6a9a34d355e752c0e3d662c9cfd5536c1abdd725 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/RollingDice.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/RollingDice.java
@@ -18,6 +18,7 @@
*/
package com.l2jserver.datapack.handlers.itemhandlers;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,7 +28,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.Dice;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
-import com.l2jserver.util.Rnd;
public class RollingDice implements IItemHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/SoulShots.java b/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/SoulShots.java
index 3fedc0e39c199db40d9f9f21fa6131398ca90fb6..84ad22ae9b54d679557d14232231530cd1e994f4 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/SoulShots.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/itemhandlers/SoulShots.java
@@ -20,6 +20,7 @@ package com.l2jserver.datapack.handlers.itemhandlers;
import java.util.logging.Level;
+import com.l2jserver.commons.util.Rnd;
import com.l2jserver.gameserver.enums.ShotType;
import com.l2jserver.gameserver.handler.IItemHandler;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -32,7 +33,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.util.Broadcast;
-import com.l2jserver.util.Rnd;
public class SoulShots implements IItemHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/ClanPenalty.java b/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/ClanPenalty.java
index c4baa20a3c5fd0d7c6d5a8f9f8ede639706fd750..7fc244485135e07dfedd7e8506b2562453ddc5ea 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/ClanPenalty.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/ClanPenalty.java
@@ -23,7 +23,7 @@ import java.text.SimpleDateFormat;
import com.l2jserver.gameserver.handler.IUserCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* Clan Penalty user command.
diff --git a/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Time.java b/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Time.java
index fc8ff27f714e6cf1b16334b15c3642421d08b112..56235a403a889220f992832354f9d29a9c1d202f 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Time.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Time.java
@@ -21,8 +21,8 @@ package com.l2jserver.datapack.handlers.usercommandhandlers;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.GameTimeController;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IUserCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Unstuck.java b/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Unstuck.java
index d16cd7d259091d2b4dc186aec511e69eb850ce99..7fe7fdf248f24f2a4c46393da49fc8482092ba67 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Unstuck.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/usercommandhandlers/Unstuck.java
@@ -26,9 +26,9 @@ import static com.l2jserver.gameserver.network.serverpackets.ActionFailed.STATIC
import static java.util.concurrent.TimeUnit.MINUTES;
import static java.util.concurrent.TimeUnit.SECONDS;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IUserCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.TvTEvent;
diff --git a/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/Lang.java b/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/Lang.java
index ac8dc2859cdc0145f51f8d6f4b4aab9f656227d2..13314950df1877ceb4dcafad0575933e4d09b8dd 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/Lang.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/Lang.java
@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
public class Lang implements IVoicedCommandHandler
{
diff --git a/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/StatsVCmd.java b/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/StatsVCmd.java
index c7687a0837dee7df624655cfa0052617d2f2a0da..4f57eded0e22a4ee2e128bc5d658660e6c18f282 100644
--- a/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/StatsVCmd.java
+++ b/src/main/java/com/l2jserver/datapack/handlers/voicedcommandhandlers/StatsVCmd.java
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.L2Event;
import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.util.StringUtil;
+import com.l2jserver.gameserver.util.StringUtil;
/**
* @author Zoey76.
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/Amaskari.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/Amaskari.java
index c86435c6698ed0bab921566b6be0775ba5c5e2b1..122cc6eb4785d6bcb9c38f56c0bb432e35812bba 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/Amaskari.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/Amaskari.java
@@ -18,6 +18,8 @@
*/
package com.l2jserver.datapack.hellbound.AI;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.hellbound.HellboundEngine;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
@@ -28,9 +30,6 @@ import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.hellbound.HellboundEngine;
-
/**
* Manages Amaskari's and minions' chat and some skill usage.
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/DemonPrince.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/DemonPrince.java
index ea19262f56e30ddd01e3c2960aca0a3de8d0da06..92c40930b8a4cd25c35a7e01da719e763167bc3a 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/DemonPrince.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/DemonPrince.java
@@ -21,13 +21,12 @@ package com.l2jserver.datapack.hellbound.AI;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
import com.l2jserver.gameserver.model.skills.Skill;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Demon Prince's AI.
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/HellboundCore.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/HellboundCore.java
index 2b1c4410e0de402869a1a9d6abc2718aae4d415b..f0d79c23876ea3c357730b1c139762d48c177e9e 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/HellboundCore.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/HellboundCore.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.hellbound.AI;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.hellbound.HellboundEngine;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.hellbound.HellboundEngine;
-
/**
* Manages Naia's cast on the Hellbound Core
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/Keltas.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/Keltas.java
index 179b87dfefa93185720a97687c3a0337420a635d..c7ee4f513e598fae5997f2a9403687b3133563e3 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/Keltas.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/Keltas.java
@@ -23,7 +23,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.L2Spawn;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Budenka/Budenka.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Budenka/Budenka.java
index 5aa16b51908e316d7543fa57a6ab0cb2f542fe2a..c6292b34c7bc578e9a7b76105e704042ed868ac3 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Budenka/Budenka.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Budenka/Budenka.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.hellbound.AI.NPC.Budenka;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Falk/Falk.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Falk/Falk.java
index 082d3e1d8f1baea596198cca4aa7868bca423c2a..b16243135b399c77d1930a6501ded1772e1850a5 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Falk/Falk.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Falk/Falk.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.hellbound.AI.NPC.Falk;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Kanaf/Kanaf.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Kanaf/Kanaf.java
index eeec57086b45ba332b904e8e2bff139a622b479c..056237d611a55c993f36703f9922cda54da7f16f 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Kanaf/Kanaf.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Kanaf/Kanaf.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.hellbound.AI.NPC.Kanaf;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Quarry/Quarry.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Quarry/Quarry.java
index e9dbbf89ce79747720500fbea6174c0447455745..2eadd82013a192ae9d43a4e81e2acb107fc6dc9d 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Quarry/Quarry.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Quarry/Quarry.java
@@ -20,8 +20,8 @@ package com.l2jserver.datapack.hellbound.AI.NPC.Quarry;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.datapack.hellbound.HellboundEngine;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.instancemanager.ZoneManager;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Shadai/Shadai.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Shadai/Shadai.java
index 75eecf951c72134b89443ed97f97e93156b14e16..50234789ba82c9568792c26a603a3722f9d3308d 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Shadai/Shadai.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Shadai/Shadai.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.hellbound.AI.NPC.Shadai;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.GameTimeController;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Warpgate/Warpgate.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Warpgate/Warpgate.java
index aea1d94ebdd784cb0bd2d2043ef4268212dfbd4b..b9e5c0fb5529864b99dca85effb28c817e433b08 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Warpgate/Warpgate.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/NPC/Warpgate/Warpgate.java
@@ -18,6 +18,10 @@
*/
package com.l2jserver.datapack.hellbound.AI.NPC.Warpgate;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
+import com.l2jserver.datapack.hellbound.HellboundEngine;
+import com.l2jserver.datapack.quests.Q00130_PathToHellbound.Q00130_PathToHellbound;
+import com.l2jserver.datapack.quests.Q00133_ThatsBloodyHot.Q00133_ThatsBloodyHot;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.PcCondOverride;
@@ -26,11 +30,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.zone.L2ZoneType;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-import com.l2jserver.datapack.hellbound.HellboundEngine;
-import com.l2jserver.datapack.quests.Q00130_PathToHellbound.Q00130_PathToHellbound;
-import com.l2jserver.datapack.quests.Q00133_ThatsBloodyHot.Q00133_ThatsBloodyHot;
-
/**
* Warpgate teleport AI.
* @author _DS_
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/NaiaLock.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/NaiaLock.java
index 6bc70cc27681aacb1ff558e7e99491257940c082..40716bb8d0499b4f515d2947dc81181255ed429c 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/NaiaLock.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/NaiaLock.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.hellbound.AI;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/Ranku.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/Ranku.java
index 1600267b3b66a81b1f0f0e4305e03ff4390a8564..14b5212369d0f628d161a971ee9d7870fdeaf69f 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/Ranku.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/Ranku.java
@@ -22,7 +22,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/Typhoon.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/Typhoon.java
index d226ce9b519de0c234af08b5e53473810c8626f6..1b05e6f1502186df74b19c19c013d1714f0d1984 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/Typhoon.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/Typhoon.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.hellbound.AI;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.instancemanager.RaidBossSpawnManager;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Typhoon's AI.
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/BaseTower/BaseTower.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/BaseTower/BaseTower.java
index 753f2a6f6b13fa7fafbcce6fccd10a85d707fc0e..829aec41b87cd9d4757faa84dd16c18f1dddd331 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/BaseTower/BaseTower.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/BaseTower/BaseTower.java
@@ -21,14 +21,13 @@ package com.l2jserver.datapack.hellbound.AI.Zones.BaseTower;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
import com.l2jserver.gameserver.model.holders.SkillHolder;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Base Tower.
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
index 4579bc3c42282e1fe676626fd369b12fa242296b..4eb485c11e2d11920ea612748dc603c1eaa431f1 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TowerOfNaia/TowerOfNaia.java
@@ -28,6 +28,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicInteger;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
@@ -47,8 +48,6 @@ import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.util.MinionList;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Tower Of Naia.
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java b/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
index 48a8e0111bfacf970d2a159bb15ca10ef008aa97..67489ebb574ea4f81583826c900cea4d7a75f3a1 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/AI/Zones/TullyWorkshop/TullyWorkshop.java
@@ -28,6 +28,7 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledFuture;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
@@ -51,8 +52,6 @@ import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.util.MinionList;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Tully's Workshop.
* @author GKR
diff --git a/src/main/java/com/l2jserver/datapack/hellbound/HellboundEngine.java b/src/main/java/com/l2jserver/datapack/hellbound/HellboundEngine.java
index 93dbd8973c002af4cce5d5e07e7e5afac945a907..532ba982f99a5cc8bcc949ebb5175fa6768bd2bc 100644
--- a/src/main/java/com/l2jserver/datapack/hellbound/HellboundEngine.java
+++ b/src/main/java/com/l2jserver/datapack/hellbound/HellboundEngine.java
@@ -22,7 +22,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.data.xml.impl.DoorData;
import com.l2jserver.gameserver.instancemanager.GlobalVariablesManager;
diff --git a/src/main/java/com/l2jserver/datapack/instances/AbstractInstance.java b/src/main/java/com/l2jserver/datapack/instances/AbstractInstance.java
index 7e29bf922fc88780faee0cf78dd174168350c5ee..129a833da735e09ef165f18e07a05050ce001767 100644
--- a/src/main/java/com/l2jserver/datapack/instances/AbstractInstance.java
+++ b/src/main/java/com/l2jserver/datapack/instances/AbstractInstance.java
@@ -22,6 +22,7 @@ import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.List;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.InstanceReenterType;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
@@ -36,8 +37,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Abstract class for Instances.
* @author FallenAngel
diff --git a/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java b/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java
index 9e29f48bbe9f53069059fe4a2c7f256ad61ae2b3..1d16518ec09c64a1359f7943af123a48fffe6599 100644
--- a/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java
+++ b/src/main/java/com/l2jserver/datapack/instances/ChambersOfDelusion/Chamber.java
@@ -22,10 +22,10 @@ import java.util.Calendar;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Level;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.datapack.instances.AbstractInstance;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Party;
diff --git a/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java b/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java
index a9b5039fd39de3c9de03c26c0958f73e2e53b220..e83be15045d632918716406a68d0ed4f3e51244f 100644
--- a/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java
+++ b/src/main/java/com/l2jserver/datapack/instances/CrystalCaverns/CrystalCaverns.java
@@ -24,11 +24,11 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.datapack.instances.AbstractInstance;
import com.l2jserver.datapack.quests.Q00131_BirdInACage.Q00131_BirdInACage;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.TrapAction;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.L2Object;
diff --git a/src/main/java/com/l2jserver/datapack/instances/FinalEmperialTomb/FinalEmperialTomb.java b/src/main/java/com/l2jserver/datapack/instances/FinalEmperialTomb/FinalEmperialTomb.java
index 8ac70b2c9c3a6c2c49a3303e616316a7cd1f3b04..a2d4223ddecee5d7391cefeb8ba94eefcc12b825 100644
--- a/src/main/java/com/l2jserver/datapack/instances/FinalEmperialTomb/FinalEmperialTomb.java
+++ b/src/main/java/com/l2jserver/datapack/instances/FinalEmperialTomb/FinalEmperialTomb.java
@@ -36,11 +36,11 @@ import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.datapack.instances.AbstractInstance;
import com.l2jserver.gameserver.GeoData;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.enums.InstanceType;
import com.l2jserver.gameserver.instancemanager.InstanceManager;
import com.l2jserver.gameserver.model.L2CommandChannel;
diff --git a/src/main/java/com/l2jserver/datapack/quests/AbstractSagaQuest.java b/src/main/java/com/l2jserver/datapack/quests/AbstractSagaQuest.java
index 74a2aad249c0263bf52bac5f468e9e4ca5ff800a..3f6901f5bcd1a049fa5b000e799f85a324db3923 100644
--- a/src/main/java/com/l2jserver/datapack/quests/AbstractSagaQuest.java
+++ b/src/main/java/com/l2jserver/datapack/quests/AbstractSagaQuest.java
@@ -23,8 +23,8 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.ai.CtrlIntention;
+import com.l2jserver.gameserver.config.Config;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.L2World;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java b/src/main/java/com/l2jserver/datapack/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
index 9b38163cf037a4f3d782352c842e1c7a1c9b68cd..22f90126cd0da85036ba5704e67c32181d974743 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00003_WillTheSealBeBroken;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java b/src/main/java/com/l2jserver/datapack/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
index ff952a0259819505bc3a3ce56d9529698b36a63b..b8ca7dccad6de16d72ddb36a2af9d1bd6c6713b0 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00004_LongLiveThePaagrioLord;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java b/src/main/java/com/l2jserver/datapack/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
index e64d94e026d4b0d64dcc687e7132d639a6456273..792ffaf06b085715dfa4b2698eef38528170c921 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00025_HidingBehindTheTruth/Q00025_HidingBehindTheTruth.java
@@ -33,7 +33,6 @@ import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.network.NpcStringId;
import com.l2jserver.gameserver.network.clientpackets.Say2;
import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.util.Rnd;
/**
* Hiding Behind the Truth (25)
@@ -261,7 +260,7 @@ public class Q00025_HidingBehindTheTruth extends Quest
{
htmltext = "31533-03.html";
}
- else if (Rnd.get(60) > qs.getMemoStateEx(1))
+ else if (getRandom(60) > qs.getMemoStateEx(1))
{
qs.setMemoStateEx(1, qs.getMemoStateEx(1) + 20);
qs.setMemoStateEx(npc.getId(), 1);
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java b/src/main/java/com/l2jserver/datapack/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
index 1100fe6a6e79c34457c49492d376f097c0cb0867..cd281c9d9045445189bd9373d6df4e37c7f544b3 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00062_PathOfTheTrooper/Q00062_PathOfTheTrooper.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00062_PathOfTheTrooper;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java b/src/main/java/com/l2jserver/datapack/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
index e64f83e969aa739e8e7d454eca003a25e889bb31..1c4a34adae102a681738a763b845ac8865b9d0fb 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00064_CertifiedBerserker/Q00064_CertifiedBerserker.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00064_CertifiedBerserker;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java b/src/main/java/com/l2jserver/datapack/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
index 5c08d128410592f62fe85921409abcd998b040f3..33b6cc02f03f962cba9a9cfd0779bc3ca26050c1 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java
@@ -18,9 +18,9 @@
*/
package com.l2jserver.datapack.quests.Q00107_MercilessPunishment;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.datapack.quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.holders.ItemHolder;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java b/src/main/java/com/l2jserver/datapack/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
index 18ff0f5ac9c077bbe2eff8911df5967c5631e79d..6a317af8b670fc94a8286a2cff0d40407b153683 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00217_TestimonyOfTrust/Q00217_TestimonyOfTrust.java
@@ -19,8 +19,8 @@
package com.l2jserver.datapack.quests.Q00217_TestimonyOfTrust;
import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java b/src/main/java/com/l2jserver/datapack/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
index 808be1bc7fc6ce109ceee9072ab6a0ea82d9b3e5..0c92d9d0f3c4cf2818e281a6f5dc9a067718bd47 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00218_TestimonyOfLife/Q00218_TestimonyOfLife.java
@@ -19,8 +19,8 @@
package com.l2jserver.datapack.quests.Q00218_TestimonyOfLife;
import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java b/src/main/java/com/l2jserver/datapack/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
index 0c4eb3167f4057aacb85c528b0c4c45c852576f6..c67f6fc153c7966b7ca2caa636fcc56df1535857 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00219_TestimonyOfFate/Q00219_TestimonyOfFate.java
@@ -19,8 +19,8 @@
package com.l2jserver.datapack.quests.Q00219_TestimonyOfFate;
import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java b/src/main/java/com/l2jserver/datapack/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
index 8a60234e405e4f60d98549366185fce73923908c..254e286cb1ebfb9976f15e1cf121741f76af2927 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00221_TestimonyOfProsperity/Q00221_TestimonyOfProsperity.java
@@ -19,8 +19,8 @@
package com.l2jserver.datapack.quests.Q00221_TestimonyOfProsperity;
import com.l2jserver.gameserver.enums.CategoryType;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java b/src/main/java/com/l2jserver/datapack/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
index fbc0f7702cda9991eaeb639da500be4046d37b21..671ef017c7cf23c6958d99a092a7904a21e59007 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00222_TestOfTheDuelist/Q00222_TestOfTheDuelist.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00222_TestOfTheDuelist;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java b/src/main/java/com/l2jserver/datapack/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
index 72a8cc14c13bcc4a2d76e26b2fe457738b045121..b3e20c0f9cbe64176974e85f18f3e1697c0538c8 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00232_TestOfTheLord/Q00232_TestOfTheLord.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00232_TestOfTheLord;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java b/src/main/java/com/l2jserver/datapack/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
index 6f76e45718a22e79a7afd864d6b70bbefaa5fb26..c2d0a026bd6255033d53cd7348446879589996e2 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00233_TestOfTheWarSpirit/Q00233_TestOfTheWarSpirit.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00233_TestOfTheWarSpirit;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/src/main/java/com/l2jserver/datapack/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
index fd82f2f1bf746bca36980b4d182fe466ae481eb2..5a21442296479075ce59472ca0acc93b6bad826b 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -21,8 +21,8 @@ package com.l2jserver.datapack.quests.Q00292_BrigandsSweep;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/src/main/java/com/l2jserver/datapack/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index 6183c105cde09a80eca5295876abd7a3b39cf2d1..f6fb6afa5d0a2d804d36652c99d6e5a33e1da867 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* Dig Up the Sea of Spores! (356)
@@ -110,7 +109,7 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest
}
case "FINISH":
{
- final int value = Rnd.get(100);
+ final int value = getRandom(100);
int adena = 0;
if (value < 20)
{
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00419_GetAPet/Q00419_GetAPet.java b/src/main/java/com/l2jserver/datapack/quests/Q00419_GetAPet/Q00419_GetAPet.java
index a4d46cdffc139c5b59d7af9549610e3f1c1372e7..fb16ef0283a90394b71bea793a31fcc09c60e1b6 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00419_GetAPet/Q00419_GetAPet.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00419_GetAPet/Q00419_GetAPet.java
@@ -21,8 +21,8 @@ package com.l2jserver.datapack.quests.Q00419_GetAPet;
import java.util.HashMap;
import java.util.Map;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.Race;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java b/src/main/java/com/l2jserver/datapack/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
index dea1843bb7129fe6d53b7edd701e246f96602788..2305da0763d39c6d94cf10e6b409ff3b95ea2ea6 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00426_QuestForFishingShot/Q00426_QuestForFishingShot.java
@@ -27,10 +27,9 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
-import com.l2jserver.util.Rnd;
/**
- * Quest for Fishing Shot (426)<br>
+ * Fishing Shot (426)
* @author Zealar
*/
public class Q00426_QuestForFishingShot extends Quest {
@@ -370,7 +369,7 @@ public class Q00426_QuestForFishingShot extends Quest {
final QuestState qs = getRandomPartyMemberState(killer, -1, 2, npc);
if (qs != null) {
if (MOBS_SPECIAL.containsKey(npc.getId())) {
- if (Rnd.get(1000) <= MOBS_SPECIAL.get(npc.getId())._chance) {
+ if (getRandom(1000) <= MOBS_SPECIAL.get(npc.getId())._chance) {
rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS_SPECIAL.get(npc.getId())._reward + 1);
}
else {
@@ -379,7 +378,7 @@ public class Q00426_QuestForFishingShot extends Quest {
playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
}
else {
- if (Rnd.get(1000) <= MOBS.get(npc.getId())._chance) {
+ if (getRandom(1000) <= MOBS.get(npc.getId())._chance) {
rewardItems(qs.getPlayer(), SWEET_FLUID, MOBS.get(npc.getId())._reward);
playSound(qs.getPlayer(), Sound.ITEMSOUND_QUEST_ITEMGET);
}
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java b/src/main/java/com/l2jserver/datapack/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
index 14b341528bd1a39813829ada718794cd3237bdad..ecfc2ecfd5f4b260578abdede20b7a367a8ff6d8 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java
@@ -29,7 +29,6 @@ import com.l2jserver.gameserver.model.quest.Quest;
import com.l2jserver.gameserver.model.quest.QuestState;
import com.l2jserver.gameserver.model.quest.State;
import com.l2jserver.gameserver.util.Util;
-import com.l2jserver.util.Rnd;
/**
* A Game of Cards (662)
@@ -720,7 +719,7 @@ public final class Q00662_AGameOfCards extends Quest
}
}
- final L2PcInstance player = players.get(Rnd.get(players.size()));
+ final L2PcInstance player = players.get(getRandom(players.size()));
if ((player != null) && Util.checkIfInRange(1500, npc, player, false))
{
if (MONSTERS.get(npc.getId()) < getRandom(1000))
diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java b/src/main/java/com/l2jserver/datapack/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
index 1386e7cfbe0fa7e89c247aa40a30454f15651a47..1d9cdf8cb1deaa50d17e0b8e822d9dde2f152c38 100644
--- a/src/main/java/com/l2jserver/datapack/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
+++ b/src/main/java/com/l2jserver/datapack/quests/Q00904_DragonTrophyAntharas/Q00904_DragonTrophyAntharas.java
@@ -18,8 +18,8 @@
*/
package com.l2jserver.datapack.quests.Q00904_DragonTrophyAntharas;
-import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.enums.QuestType;
+import com.l2jserver.gameserver.enums.audio.Sound;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.quest.Quest;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange1/DarkElfChange1.java b/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange1/DarkElfChange1.java
index 2daf6331b3be838614059b4e8828af5526767ff9..6c9af579df0a0121744dd2de87cd0d2f70154d4d 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange1/DarkElfChange1.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange1/DarkElfChange1.java
@@ -18,14 +18,13 @@
*/
package com.l2jserver.datapack.village_master.DarkElfChange1;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Dark Elf class transfer AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange2/DarkElfChange2.java b/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange2/DarkElfChange2.java
index 330083fd0ed858871c8d34db4ca257728e31c66d..f0be047489ddb753bb3d7767f840d8b291f706aa 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange2/DarkElfChange2.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/DarkElfChange2/DarkElfChange2.java
@@ -18,13 +18,12 @@
*/
package com.l2jserver.datapack.village_master.DarkElfChange2;
+import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.base.ClassId;
-import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
/**
* Dark Elf class transfer AI.
* @author Adry_85
diff --git a/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java b/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
index 9151a715088420b375f175773c3b061a71430f80..7ec0f4d4d1da719cb57da97969b80f2cf3a267f9 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange1/DwarfBlacksmithChange1.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.DwarfBlacksmithChange1;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java b/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
index 2cd9b635b5fd9d822ab7fe7c0e7d5a31675a723a..a8949272818425ff5948e7bbe1bb3e0a1d1c24b0 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/DwarfBlacksmithChange2/DwarfBlacksmithChange2.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.DwarfBlacksmithChange2;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java b/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
index c0df9993c3241708d9947b27a9119487113faec5..e6e9735409bbe7ad43e8f9bed623385224add50e 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange1/DwarfWarehouseChange1.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.DwarfWarehouseChange1;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java b/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
index 75035be73fd4138325ca230d6e0df81150afe85a..636676a4c2fee9f4ff2b83bd144cb92f41f9caca 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/DwarfWarehouseChange2/DwarfWarehouseChange2.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.DwarfWarehouseChange2;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
index bae4d1ceef9da9e2e37a765c029179fd790b3fd1..80d7b578f3274d16b73942a49d765da9dfc7be44 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanClericChange2/ElfHumanClericChange2.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.ElfHumanClericChange2;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
index e1a6dfb52da92192ba3f20c7e73c57fb8d36c73a..6fbca165745706df58becfd9c5ac78e29e64b5b0 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange1/ElfHumanFighterChange1.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.ElfHumanFighterChange1;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
index 095f9530504b19910c9cbcc8b3718ddb600b3a74..5001c108b6370312917f9e290f78677d15010f2a 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanFighterChange2/ElfHumanFighterChange2.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.ElfHumanFighterChange2;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
index 591698e923f9e1f83847a47f0e02eada36d19cd5..b9ed58e2855b600c15d389801ea8f4cb973aa256 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange1/ElfHumanWizardChange1.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.ElfHumanWizardChange1;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
index 94a1206c6aadcb66e75509bae5f081a3aac57178..33ed218e80409d80dd0fa5ab545bfd11587943c5 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/ElfHumanWizardChange2/ElfHumanWizardChange2.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.ElfHumanWizardChange2;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/OrcChange1/OrcChange1.java b/src/main/java/com/l2jserver/datapack/village_master/OrcChange1/OrcChange1.java
index ea591efc972a10414aa0dd2033b11f3204cab17b..4ce70dda6a231eeae30b21c6c512d8ec71fd187b 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/OrcChange1/OrcChange1.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/OrcChange1/OrcChange1.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.OrcChange1;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.enums.Race;
import com.l2jserver.gameserver.model.actor.L2Npc;
diff --git a/src/main/java/com/l2jserver/datapack/village_master/OrcChange2/OrcChange2.java b/src/main/java/com/l2jserver/datapack/village_master/OrcChange2/OrcChange2.java
index ca171854a6b5f638c0be2a3368aca533edeb81a8..3c512bbbb4c7b013019f9b33c6cff45a9d9dc52f 100644
--- a/src/main/java/com/l2jserver/datapack/village_master/OrcChange2/OrcChange2.java
+++ b/src/main/java/com/l2jserver/datapack/village_master/OrcChange2/OrcChange2.java
@@ -19,7 +19,6 @@
package com.l2jserver.datapack.village_master.OrcChange2;
import com.l2jserver.datapack.ai.npc.AbstractNpcAI;
-
import com.l2jserver.gameserver.enums.CategoryType;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;