From 6e87a1502156f08cb9d34bf6fd0b6869bc334b65 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Sun, 10 Mar 2019 17:07:06 -0300
Subject: [PATCH] Utilities from Core and not from Commons
Organizing all imports.
---
.../datapack/ai/fantasy_isle/MC_Show.java | 3 +--
.../ai/group_template/AltarsOfSacrifice.java | 16 +++++++++-------
.../datapack/ai/group_template/DenOfEvil.java | 3 +--
.../datapack/ai/group_template/DragonValley.java | 3 +--
.../datapack/ai/group_template/FairyTrees.java | 3 +--
.../ai/group_template/FeedableBeasts.java | 7 +++----
.../datapack/ai/group_template/FleeMonsters.java | 1 -
.../ai/group_template/FrozenLabyrinth.java | 3 +--
.../datapack/ai/group_template/GiantsCave.java | 3 +--
.../datapack/ai/group_template/HotSprings.java | 3 +--
.../datapack/ai/group_template/IsleOfPrayer.java | 1 -
.../ai/group_template/LairOfAntharas.java | 3 +--
.../ai/group_template/MinionSpawnManager.java | 3 +--
.../ai/group_template/MonasteryOfSilence.java | 3 +--
.../ai/group_template/NonLethalableNpcs.java | 1 -
.../ai/group_template/NonTalkingNpcs.java | 1 -
.../datapack/ai/group_template/PavelArchaic.java | 3 +--
.../datapack/ai/group_template/PlainsOfDion.java | 3 +--
.../ai/group_template/PlainsOfLizardman.java | 3 +--
.../ai/group_template/PolymorphingAngel.java | 1 -
.../ai/group_template/PolymorphingOnAttack.java | 1 -
.../datapack/ai/group_template/PrimevalIsle.java | 3 +--
.../datapack/ai/group_template/PrisonGuards.java | 3 +--
.../ai/group_template/RaidBossCancel.java | 3 +--
.../datapack/ai/group_template/RandomSpawn.java | 1 -
.../datapack/ai/group_template/RangeGuard.java | 3 +--
.../datapack/ai/group_template/Remnants.java | 1 -
.../datapack/ai/group_template/Sandstorms.java | 3 +--
.../ai/group_template/SeeThroughSilentMove.java | 1 -
.../ai/group_template/SelMahumDrill.java | 1 -
.../ai/group_template/SelMahumSquad.java | 3 +--
.../datapack/ai/group_template/SilentValley.java | 3 +--
.../datapack/ai/group_template/StakatoNest.java | 3 +--
.../datapack/ai/group_template/SummonPc.java | 3 +--
.../ai/group_template/TreasureChest.java | 3 +--
.../datapack/ai/group_template/TurekOrcs.java | 1 -
.../ai/group_template/WarriorFishingBlock.java | 1 -
.../l2jserver/datapack/ai/individual/Anais.java | 3 +--
.../ai/individual/Antharas/Antharas.java | 5 ++---
.../datapack/ai/individual/Baium/Baium.java | 5 ++---
.../datapack/ai/individual/Ballista.java | 1 -
.../l2jserver/datapack/ai/individual/Beleth.java | 5 ++---
.../datapack/ai/individual/BlackdaggerWing.java | 3 +--
.../datapack/ai/individual/BleedingFly.java | 3 +--
.../l2jserver/datapack/ai/individual/Core.java | 3 +--
.../datapack/ai/individual/CrimsonHatuOtis.java | 3 +--
.../datapack/ai/individual/DarkWaterDragon.java | 1 -
.../datapack/ai/individual/DivineBeast.java | 1 -
.../datapack/ai/individual/DrakosWarrior.java | 3 +--
.../datapack/ai/individual/DustRider.java | 3 +--
.../datapack/ai/individual/EmeraldHorn.java | 3 +--
.../l2jserver/datapack/ai/individual/Epidos.java | 1 -
.../datapack/ai/individual/EvasGiftBox.java | 1 -
.../ai/individual/FrightenedRagnaOrc.java | 3 +--
.../l2jserver/datapack/ai/individual/Gordon.java | 3 +--
.../datapack/ai/individual/GraveRobbers.java | 1 -
.../datapack/ai/individual/MuscleBomber.java | 3 +--
.../ai/individual/NecromancerOfTheValley.java | 3 +--
.../l2jserver/datapack/ai/individual/Orfen.java | 5 ++---
.../datapack/ai/individual/QueenAnt.java | 5 ++---
.../datapack/ai/individual/QueenShyeed.java | 1 -
.../ai/individual/RagnaOrcCommander.java | 1 -
.../datapack/ai/individual/RagnaOrcHero.java | 1 -
.../datapack/ai/individual/RagnaOrcSeer.java | 1 -
.../datapack/ai/individual/Sailren/Sailren.java | 3 +--
.../datapack/ai/individual/ShadowSummoner.java | 3 +--
.../datapack/ai/individual/SinEater.java | 1 -
.../datapack/ai/individual/SinWardens.java | 1 -
.../datapack/ai/individual/Valakas.java | 5 ++---
.../datapack/ai/individual/Venom/Venom.java | 3 +--
.../datapack/ai/npc/Abercrombie/Abercrombie.java | 1 -
.../datapack/ai/npc/Alexandria/Alexandria.java | 3 +--
.../ai/npc/ArenaManager/ArenaManager.java | 3 +--
.../l2jserver/datapack/ai/npc/Asamah/Asamah.java | 5 ++---
.../datapack/ai/npc/BlackJudge/BlackJudge.java | 1 -
.../BlackMarketeerOfMammon.java | 3 +--
.../npc/CastleAmbassador/CastleAmbassador.java | 1 -
.../npc/CastleBlacksmith/CastleBlacksmith.java | 1 -
.../npc/CastleChamberlain/CastleChamberlain.java | 5 ++---
.../CastleCourtMagician/CastleCourtMagician.java | 3 +--
.../CastleMercenaryManager.java | 1 -
.../CastleSiegeManager/CastleSiegeManager.java | 1 -
.../npc/CastleTeleporter/CastleTeleporter.java | 1 -
.../ai/npc/CastleWarehouse/CastleWarehouse.java | 1 -
.../datapack/ai/npc/ClanTrader/ClanTrader.java | 1 -
.../datapack/ai/npc/ClassMaster/ClassMaster.java | 5 ++---
.../ai/npc/DragonVortex/DragonVortex.java | 3 +--
.../ai/npc/EchoCrystals/EchoCrystals.java | 3 +--
.../datapack/ai/npc/FameManager/FameManager.java | 1 -
.../datapack/ai/npc/Fisherman/Fisherman.java | 3 +--
.../ai/npc/ForgeOfTheGods/ForgeOfTheGods.java | 1 -
.../datapack/ai/npc/ForgeOfTheGods/Rooney.java | 3 +--
.../ai/npc/ForgeOfTheGods/TarBeetle.java | 3 +--
.../ai/npc/ForgeOfTheGods/TarBeetleSpawn.java | 2 +-
.../FortressArcherCaptain.java | 1 -
.../FortressSiegeManager.java | 1 -
.../ai/npc/FreyasSteward/FreyasSteward.java | 1 -
.../ai/npc/KetraOrcSupport/KetraOrcSupport.java | 1 -
.../com/l2jserver/datapack/ai/npc/Kier/Kier.java | 7 +++----
.../ai/npc/ManorManager/ManorManager.java | 1 -
.../npc/MercenaryCaptain/MercenaryCaptain.java | 1 -
.../datapack/ai/npc/Minigame/Minigame.java | 3 +--
.../npc/MonumentOfHeroes/MonumentOfHeroes.java | 1 -
.../ai/npc/NevitsHerald/NevitsHerald.java | 6 ++----
.../datapack/ai/npc/NpcBuffers/NpcBuffers.java | 3 +--
.../ai/npc/NpcBuffers/impl/CabaleBuffer.java | 1 -
.../npc/PriestOfBlessing/PriestOfBlessing.java | 1 -
.../datapack/ai/npc/Rafforty/Rafforty.java | 1 -
.../l2jserver/datapack/ai/npc/Rignos/Rignos.java | 1 -
.../l2jserver/datapack/ai/npc/Selina/Selina.java | 1 -
.../l2jserver/datapack/ai/npc/Sirra/Sirra.java | 1 -
.../SubclassCertification.java | 1 -
.../npc/Summons/MerchantGolem/GolemTrader.java | 1 -
.../datapack/ai/npc/Summons/Pets/BabyPets.java | 3 +--
.../ai/npc/Summons/Pets/ImprovedBabyPets.java | 3 +--
.../SupportUnitCaptain/SupportUnitCaptain.java | 1 -
.../datapack/ai/npc/SymbolMaker/SymbolMaker.java | 1 -
.../datapack/ai/npc/Teleports/Asher/Asher.java | 3 +--
.../ai/npc/Teleports/CrumaTower/CrumaTower.java | 1 -
.../DelusionTeleport/DelusionTeleport.java | 1 -
.../ElrokiTeleporters/ElrokiTeleporters.java | 3 +--
.../GatekeeperSpirit/GatekeeperSpirit.java | 1 -
.../GhostChamberlainOfElmoreden.java | 3 +--
.../GrandBossTeleporters.java | 1 -
.../HuntingGroundsTeleport.java | 1 -
.../datapack/ai/npc/Teleports/Klemis/Klemis.java | 1 -
.../MithrilMinesTeleporter.java | 1 -
.../npc/Teleports/NewbieGuide/NewbieGuide.java | 5 ++---
.../NoblesseTeleport/NoblesseTeleport.java | 1 -
.../Teleports/OracleTeleport/OracleTeleport.java | 3 +--
.../PaganTeleporters/PaganTeleporters.java | 1 -
.../Teleports/SeparatedSoul/SeparatedSoul.java | 3 +--
.../StakatoNestTeleporter.java | 5 ++---
.../SteelCitadelTeleport.java | 1 -
.../StrongholdsTeleports.java | 1 -
.../ai/npc/Teleports/Survivor/Survivor.java | 1 -
.../TeleportToFantasy/TeleportToFantasy.java | 1 -
.../TeleportToRaceTrack/TeleportToRaceTrack.java | 1 -
.../TeleportToUndergroundColiseum.java | 1 -
.../TeleportWithCharm/TeleportWithCharm.java | 1 -
.../ai/npc/Teleports/ToIVortex/ToIVortex.java | 1 -
.../npc/TerritoryManagers/TerritoryManagers.java | 1 -
.../datapack/ai/npc/TownPets/TownPets.java | 3 +--
.../Trainers/HealerTrainer/HealerTrainer.java | 1 -
.../VarkaSilenosSupport/VarkaSilenosSupport.java | 1 -
.../FirstClassTransferTalk.java | 1 -
.../datapack/ai/npc/WeaverOlf/WeaverOlf.java | 1 -
.../ai/npc/WyvernManager/WyvernManager.java | 3 +--
.../datapack/custom/events/Elpies/Elpies.java | 2 +-
.../datapack/custom/events/Race/Race.java | 2 +-
.../custom/events/TvT/TvTManager/TvTManager.java | 1 -
.../datapack/custom/events/Wedding/Wedding.java | 1 -
.../datapack/custom/listeners/ListenerTest.java | 6 ++----
.../features/SkillTransfer/SkillTransfer.java | 3 +--
.../datapack/gracia/AI/EnergySeeds.java | 2 +-
.../l2jserver/datapack/gracia/AI/Lindvior.java | 1 -
.../com/l2jserver/datapack/gracia/AI/Maguen.java | 5 ++---
.../AI/NPC/FortuneTelling/FortuneTelling.java | 1 -
.../AI/NPC/GeneralDilios/GeneralDilios.java | 1 -
.../datapack/gracia/AI/NPC/Lekon/Lekon.java | 1 -
.../datapack/gracia/AI/NPC/Seyo/Seyo.java | 1 -
.../AI/NPC/ZealotOfShilen/ZealotOfShilen.java | 1 -
.../SeedOfAnnihilation/SeedOfAnnihilation.java | 3 +--
.../l2jserver/datapack/gracia/AI/StarStones.java | 1 -
.../instances/SeedOfDestruction/Stage1.java | 2 +-
.../handlers/actionhandlers/L2NpcAction.java | 4 ++--
.../L2ItemInstanceActionShift.java | 2 +-
.../L2StaticObjectInstanceActionShift.java | 2 +-
.../admincommandhandlers/AdminAnnouncements.java | 2 +-
.../admincommandhandlers/AdminBuffs.java | 2 +-
.../admincommandhandlers/AdminCursedWeapons.java | 2 +-
.../admincommandhandlers/AdminEditChar.java | 2 +-
.../admincommandhandlers/AdminEventEngine.java | 4 ++--
.../admincommandhandlers/AdminEvents.java | 2 +-
.../AdminFightCalculator.java | 2 +-
.../admincommandhandlers/AdminFortSiege.java | 2 +-
.../handlers/admincommandhandlers/AdminHtml.java | 2 +-
.../admincommandhandlers/AdminInstanceZone.java | 2 +-
.../admincommandhandlers/AdminLogin.java | 2 +-
.../admincommandhandlers/AdminManor.java | 2 +-
.../admincommandhandlers/AdminPunishment.java | 2 +-
.../admincommandhandlers/AdminReload.java | 2 +-
.../admincommandhandlers/AdminSiege.java | 4 ++--
.../admincommandhandlers/AdminSkill.java | 2 +-
.../admincommandhandlers/AdminSpawn.java | 4 ++--
.../admincommandhandlers/AdminTeleport.java | 2 +-
.../handlers/admincommandhandlers/AdminTest.java | 2 +-
.../handlers/admincommandhandlers/AdminZone.java | 2 +-
.../handlers/bypasshandlers/Festival.java | 4 ++--
.../handlers/bypasshandlers/QuestLink.java | 2 +-
.../handlers/communityboard/ClanBoard.java | 2 +-
.../handlers/effecthandlers/custom/OpenDoor.java | 2 +-
.../handlers/effecthandlers/instant/Confuse.java | 2 +-
.../effecthandlers/instant/DeathLink.java | 2 +-
.../instant/DispelBySlotProbability.java | 2 +-
.../handlers/effecthandlers/instant/Fishing.java | 4 ++--
.../effecthandlers/instant/Harvesting.java | 2 +-
.../instant/HeadquarterCreate.java | 2 +-
.../handlers/effecthandlers/instant/Lethal.java | 2 +-
.../effecthandlers/instant/MagicalAttack.java | 2 +-
.../instant/MagicalAttackByAbnormal.java | 2 +-
.../instant/MagicalSoulAttack.java | 2 +-
.../effecthandlers/instant/RandomizeHate.java | 2 +-
.../instant/RestorationRandom.java | 2 +-
.../handlers/effecthandlers/instant/RunAway.java | 2 +-
.../handlers/effecthandlers/instant/Sow.java | 2 +-
.../effecthandlers/instant/SummonCubic.java | 2 +-
.../effecthandlers/instant/SummonNpc.java | 2 +-
.../effecthandlers/instant/Unsummon.java | 2 +-
.../pump/TriggerSkillByAttack.java | 2 +-
.../effecthandlers/pump/TriggerSkillByAvoid.java | 2 +-
.../pump/TriggerSkillByDamage.java | 2 +-
.../effecthandlers/pump/TriggerSkillBySkill.java | 2 +-
.../handlers/itemhandlers/ExtractableItems.java | 2 +-
.../handlers/itemhandlers/RollingDice.java | 2 +-
.../handlers/itemhandlers/SoulShots.java | 2 +-
.../usercommandhandlers/ClanPenalty.java | 2 +-
.../handlers/usercommandhandlers/Time.java | 2 +-
.../handlers/usercommandhandlers/Unstuck.java | 2 +-
.../handlers/voicedcommandhandlers/Lang.java | 2 +-
.../voicedcommandhandlers/StatsVCmd.java | 2 +-
.../datapack/hellbound/AI/Amaskari.java | 5 ++---
.../datapack/hellbound/AI/DemonPrince.java | 3 +--
.../datapack/hellbound/AI/HellboundCore.java | 5 ++---
.../l2jserver/datapack/hellbound/AI/Keltas.java | 1 -
.../hellbound/AI/NPC/Budenka/Budenka.java | 1 -
.../datapack/hellbound/AI/NPC/Falk/Falk.java | 1 -
.../datapack/hellbound/AI/NPC/Kanaf/Kanaf.java | 1 -
.../datapack/hellbound/AI/NPC/Quarry/Quarry.java | 2 +-
.../datapack/hellbound/AI/NPC/Shadai/Shadai.java | 1 -
.../hellbound/AI/NPC/Warpgate/Warpgate.java | 9 ++++-----
.../datapack/hellbound/AI/NaiaLock.java | 1 -
.../l2jserver/datapack/hellbound/AI/Ranku.java | 1 -
.../l2jserver/datapack/hellbound/AI/Typhoon.java | 3 +--
.../hellbound/AI/Zones/BaseTower/BaseTower.java | 3 +--
.../AI/Zones/TowerOfNaia/TowerOfNaia.java | 3 +--
.../AI/Zones/TullyWorkshop/TullyWorkshop.java | 3 +--
.../datapack/hellbound/HellboundEngine.java | 1 -
.../datapack/instances/AbstractInstance.java | 3 +--
.../instances/ChambersOfDelusion/Chamber.java | 2 +-
.../instances/CrystalCaverns/CrystalCaverns.java | 2 +-
.../FinalEmperialTomb/FinalEmperialTomb.java | 2 +-
.../datapack/quests/AbstractSagaQuest.java | 2 +-
.../Q00003_WillTheSealBeBroken.java | 2 +-
.../Q00004_LongLiveThePaagrioLord.java | 2 +-
.../Q00025_HidingBehindTheTruth.java | 3 +--
.../Q00062_PathOfTheTrooper.java | 2 +-
.../Q00064_CertifiedBerserker.java | 2 +-
.../Q00107_MercilessPunishment.java | 2 +-
.../Q00217_TestimonyOfTrust.java | 2 +-
.../Q00218_TestimonyOfLife.java | 2 +-
.../Q00219_TestimonyOfFate.java | 2 +-
.../Q00221_TestimonyOfProsperity.java | 2 +-
.../Q00222_TestOfTheDuelist.java | 2 +-
.../Q00232_TestOfTheLord.java | 2 +-
.../Q00233_TestOfTheWarSpirit.java | 2 +-
.../Q00292_BrigandsSweep.java | 2 +-
.../Q00356_DigUpTheSeaOfSpores.java | 3 +--
.../quests/Q00419_GetAPet/Q00419_GetAPet.java | 2 +-
.../Q00426_QuestForFishingShot.java | 7 +++----
.../Q00662_AGameOfCards/Q00662_AGameOfCards.java | 3 +--
.../Q00904_DragonTrophyAntharas.java | 2 +-
.../DarkElfChange1/DarkElfChange1.java | 3 +--
.../DarkElfChange2/DarkElfChange2.java | 3 +--
.../DwarfBlacksmithChange1.java | 1 -
.../DwarfBlacksmithChange2.java | 1 -
.../DwarfWarehouseChange1.java | 1 -
.../DwarfWarehouseChange2.java | 1 -
.../ElfHumanClericChange2.java | 1 -
.../ElfHumanFighterChange1.java | 1 -
.../ElfHumanFighterChange2.java | 1 -
.../ElfHumanWizardChange1.java | 1 -
.../ElfHumanWizardChange2.java | 1 -
.../village_master/OrcChange1/OrcChange1.java | 1 -
.../village_master/OrcChange2/OrcChange2.java | 1 -
275 files changed, 212 insertions(+), 405 deletions(-)
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 f1790b4b3c..5b9ca291a3 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 e64a0d67b3..cf9bc7c13c 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 6546d24d9c..3e220f3156 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 a65c8c34cc..22e5a299d7 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 c2f2ceae70..5e8534519e 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 758eda52c1..dc54908741 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 51b67abfda..522cd94f88 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 3f3c33a2a2..b04344e100 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 d2fe3a5f65..45d190b889 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 685f91655e..c33b771686 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 51c64301c2..212458853f 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 0ad0bea805..391af150d6 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 63a6afa8f5..7c2d9e7c82 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 ee8b913c17..968e3d4882 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 7348d5ae4b..a12fcaa465 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 c95f771e97..6021371b50 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 2092a74a73..a1fc80b29e 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 f5a342f6d1..5ffa9dd587 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 c6e6e5bb38..d8536afc56 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 4af4a3f79f..6c6fe8c33c 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 93e0d1bbf3..d82147e2a1 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 5b1349e1ed..462be83185 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 7cf3b37b4d..74df5efd37 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 2d02ee04dd..fd63896b91 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 d500262267..4b32245458 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 4b2a3dc12a..ba1fa15047 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 c2c3c9c8e4..e8ad220af5 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 ffc0383a66..9a247c9701 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 91dcc03498..180d2cdd31 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 b5dcbc33d2..517c4222ba 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 2f6320b96c..52f6d7dd8c 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 aedb41ded0..22927ed431 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 c789b8b9e6..16ec058a62 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 7efeddd6dd..1089b9ceca 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 d3dab6f8ef..0469a36cbd 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 328342b38f..cc3c0755ab 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 fdebf175ba..ec30cd0a04 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 24986ab247..7f42cd71a2 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 75337d8e31..f67501f459 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 72b0415776..b31a598dcb 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 202757a032..35aa57cefe 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 1a137add7f..fd9921727c 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 81231bbe03..f918fd9182 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 af1d97eda1..68c1f681a6 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 519813abea..e168708591 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 c91f1a3f9d..e63816d649 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 ca699ee10f..7b571f2891 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 0919821a8c..cdd57574ca 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 57d74d5c18..b4ce8bb183 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 86f1912324..84c4ed3431 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 afb1920c3b..2e6bb4b8e6 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 b734666812..beecfe3fc8 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 f838c96fb1..61e2997e3d 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 564935b880..fe6b7ce641 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 65a4d1cec0..250a1663dd 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 6ca8047b6e..c0ce193619 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 7e0fa01526..b6ab1945a1 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 83ad4462c6..50485aa12b 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 0b09308bdd..f4230b7ada 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 2bf6841e3b..2007ea154b 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 bd00fd03e8..3191d58bfd 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 aedc2af9cd..0deb04f1aa 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 58bbbd6994..935ad3a992 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 91a863d1d2..f3651cb6d0 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 1e1dabf3fa..aee3ca5d33 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 a194749b96..c72f16ee29 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 d8d733a0bb..7e02a4f271 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 d9d2495a72..0c101d04be 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 3e345c8ba1..56d962f2ec 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 9b4ccafba8..611faf852c 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 a0eec5cae0..e07997b93e 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 80f940bc4d..5b2475b6af 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 60d3322ef6..c3810e2cc7 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 092402bfb2..5ff5149aec 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 ad6a18cc4d..336a4bfc72 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 5c3e9b1e84..b40034c47c 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 1299eb68df..adffafdf66 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 fe5b7a6cd5..04015a968a 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 bfa76d953f..d7ef7ccc69 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 f0b31bb547..e6c6e0c960 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 01449f166c..f10534b330 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 96ff538956..e5571cf61f 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 f9a5e9843e..c8def615a7 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 81f563306a..a8d4e3977d 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 0124d14fad..3e4d862522 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 c6d756e558..9e2dbb1241 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 6bfb6fab48..618ee58ad1 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 56fe026766..83e338a00c 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 b8e97eb105..bbff43069e 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 aaf99d7eb7..3f19b194aa 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 eea0b6082b..06fee18174 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 27445a7246..254cfad2c0 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 f97af09a78..b2da24bbca 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 aaca8444bb..a773c83b29 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 76bc301e8d..fad0a17e62 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 60645e3e1f..f81224e643 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 8026d2f521..a6bac2a005 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 2ff2635167..9e11f4ac31 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 e865660962..9ca9502994 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 1f99aaf794..cb8c7a1d58 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 93b0bb6546..d2ee5180f2 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 0c79355cb8..a1e6a6ecae 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 39f8c213e7..2a58ce70b6 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 f14bc4cdb0..20d306b564 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 8ab85ae79d..e1252349cc 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 109d2f89de..9ba3742967 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 c1303b5d00..368608e1c6 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 6432abe5cf..431e5c1eff 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 7eadeaa19d..c22ae34449 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 abd8056bc1..a5539bb5a1 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 d7b6f072ec..0659bbbf3e 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 cb77d367a4..641c1e79fc 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 7ba99affd7..87b9e6d7b4 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 ad4d616b7a..f2b5676e22 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 4a5d65de0e..6b2fe8d91b 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 fc9b8f009f..cdab20adbe 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 b367c3ff74..a8244a1ab6 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 cd12422202..310e64237e 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 e6e25de1fc..38c8913d41 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 cb62744691..f0f740a0e6 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 2f4623bd8b..d3c339a23f 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 06c3cd2913..9085de34a9 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 668aa7d378..86c9b93864 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 2093a4be93..9c045e828a 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 4ab78058df..48b4e80afb 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 af517efdbb..a2dae936ac 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 41baa55a15..1cdc4b246c 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 a09edaf689..98054c41a5 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 2004ebc961..04d8d22738 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 4742661566..efb394f1c5 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 16cf674008..12eb4dc0d7 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 bcc828070d..19ae6328f4 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 5dd791bc42..8f1ab56074 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 dd766d32a8..31290c66a7 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 acc399a74b..0bd3871c9b 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 394895d8cf..659b10305d 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 41832d1222..79d3207735 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 b7ea66d5ef..c7eff6faae 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 62e739b3d7..c5099da39c 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 86e97f3c60..b15fdca6e8 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 dc5bad7f22..7ef7bf32ab 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 9ad3342f3b..f5a2ed17a7 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 013bca1404..a25b710604 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 f438845784..55cfd9e133 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 efc07acbea..7ed3abbc8d 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 9efb57d45f..f995bb62a5 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 072dc3f915..3e9a8cddc9 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 83aeaec545..7e45101f71 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 9b8aabdad5..89ba6163bb 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 2b2fcd63c7..01706989a6 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 b6c28a682f..e3e658262e 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 82049cf642..d4c62ce1ab 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 ed4c7565a0..fbf91b79a4 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 d72cf098ed..0e4a97f344 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 42ea903346..29b3ea877e 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 b233be7e25..8fad8ff3ea 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 801cee9664..5bbf1ed4a6 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 7843627ad8..25acfa01e2 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 4baac93a5d..19f3667f76 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 de2f00712f..88afc9462c 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 9f072f4a9f..1f8750d17f 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 5c9a49d99f..b7aabc1f74 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 0c2985ca01..b6bc9911fe 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 ffecfbabe5..8e76aa0c14 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 33dc740c03..a09bd31627 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 9d9a28839b..dddd5a7c61 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 9ebd75abbb..13a01ae8f1 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 e1bfe5f49f..e451c6f2a6 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 a98481c44a..706e67ba17 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 dee4f125e4..381092d8bf 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 8d982c81b7..f97e0cfe12 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 e24504c9bb..e2d5dad64d 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 2ff52864c6..989deb662b 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 7147c87307..cb27371cc0 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 f27ead06c1..4c99b39bb0 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 7183aa649e..823776bc9d 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 6af8bda0a7..4ca27fa6e3 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 36e72b2769..f1ad372499 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 01308eb26c..1cc4dc8959 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 8526408ecb..6435acc12d 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 0cf6d4974c..989126101b 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 75a0255cc1..a934b15f15 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 0510282924..a2b7a8d4bf 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 a2a8018bde..abd0696a88 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 b1a2d64c74..2fef5e50e8 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 2d67fb2ea2..ca1bc2f7f9 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 10d2220eb9..0506bea428 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 cadb599b18..915d09c4cd 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 c79a26229e..f6ac5bb750 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 1e4938a1ab..c1af571246 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 b1c92525f2..5112ef29ee 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 9b46a3a310..97294da7ca 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 2e7577fcf3..4dc0a68f43 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 c2160eb973..9c21de8092 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 b65aac0609..67acc6aed4 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 244965b6ed..99265ca4bc 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 708cc25bb1..88eb241ca4 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 f98da61068..b53150c8f3 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 3e0cc92637..7d6a56bc38 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 8aba6b8502..16c612cebd 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 1e1a6be831..fc89911c86 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 c7c9720d21..40140d7a13 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 aba890582a..9a57488e90 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 a6eaae1f2c..5449be62b2 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 fcd3a84b1d..350fe17622 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 abb2ad1b9f..1a4bfeef06 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 58da7c49ec..8e6fb742f4 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 1ffcd0ec89..a9730f86c6 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 d27df901cd..fb4065db74 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 9a3ccee646..31d1d0ed06 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 b1ca3b1b27..b105926836 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 cb33e5b628..bf0c92cebb 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 a4cd447c8f..783567630f 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 2d0c9b7613..003f497d72 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 3f1c1ae633..6a9a34d355 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 3fedc0e39c..84ad22ae9b 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 c4baa20a3c..7fc2444851 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 fc8ff27f71..56235a403a 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 d16cd7d259..7fe7fdf248 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 ac8dc2859c..13314950df 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 c7687a0837..4f57eded0e 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 c86435c669..122cc6eb47 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 ea19262f56..92c40930b8 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 2b1c4410e0..f0d79c2387 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 179b87dfef..c7ee4f513e 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 5aa16b5190..c6292b34c7 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 082d3e1d8f..b16243135b 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 eeec57086b..056237d611 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 e9dbbf89ce..2eadd82013 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 75eecf951c..50234789ba 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 aea1d94ebd..b9e5c0fb55 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 6bc70cc276..40716bb8d0 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 1600267b3b..14b5212369 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 d226ce9b51..1b05e6f150 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 753f2a6f6b..829aec41b8 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 4579bc3c42..4eb485c11e 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 48a8e0111b..67489ebb57 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 93dbd8973c..532ba982f9 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 7e29bf922f..129a833da7 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 9e29f48bbe..1d16518ec0 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 a9b5039fd3..e83be15045 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 8ac70b2c9c..a2d4223dde 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 74a2aad249..3f6901f5bc 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 9b38163cf0..22f90126cd 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 ff952a0259..b8ca7dccad 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 e64d94e026..792ffaf06b 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 1100fe6a6e..cd281c9d90 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 e64f83e969..1c4a34adae 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 5c08d12841..33b6cc02f0 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 18ff0f5ac9..6a317af8b6 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 808be1bc7f..0c92d9d0f3 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 0c4eb3167f..c67f6fc153 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 8a60234e40..254e286cb1 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 fbc0f7702c..671ef017c7 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 72a8cc14c1..b3e20c0f9c 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 6f76e45718..c2d0a026bd 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 fd82f2f1bf..5a21442296 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 6183c105cd..f6fb6afa5d 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 a4d46cdffc..fb16ef0283 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 dea1843bb7..2305da0763 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 14b341528b..ecfc2ecfd5 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 1386e7cfbe..1d9cdf8cb1 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 2daf6331b3..6c9af579df 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 330083fd0e..f0be047489 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 9151a71508..7ec0f4d4d1 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 2cd9b635b5..a894927281 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 c0df9993c3..e6e9735409 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 75035be73f..636676a4c2 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 bae4d1ceef..80d7b578f3 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 e1a6dfb52d..6fbca16574 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 095f953050..5001c108b6 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 591698e923..b9ed58e285 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 94a1206c6a..33ed218e80 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 ea591efc97..4ce70dda6a 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 ca171854a6..3c512bbbb4 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;
--
GitLab