XML Parser changes

Included source cleanup.

L2J_DataPack/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java

@@ -18,6 +18,7 @@
  */
 package ai.npc.CastleCourtMagician;
 
+import handlers.effecthandlers.CallPc;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.ClanPrivilege;
@@ -26,8 +27,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.network.clientpackets.RequestAcquireSkill;
 
-import handlers.effecthandlers.CallPc;
-
 /**
  * Castle Court Magician AI.
  * @author St3eT

L2J_DataPack/dist/game/data/scripts/ai/npc/ForgeOfTheGods/TarBeetleSpawn.java

@@ -30,8 +30,8 @@ import org.w3c.dom.Node;
 
 import com.l2jserver.gameserver.GeoData;
 import com.l2jserver.gameserver.ThreadPoolManager;
+import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.datatables.NpcData;
-import com.l2jserver.gameserver.engines.DocumentParser;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.L2Territory;
 import com.l2jserver.gameserver.model.Location;
@@ -42,7 +42,7 @@ import com.l2jserver.util.Rnd;
  * Tar Beetle zone spawn
  * @author malyelfik
  */
-public class TarBeetleSpawn implements DocumentParser
+public class TarBeetleSpawn implements IXmlReader
 {
 	private final List<SpawnZone> zones = new ArrayList<>();
 	private ScheduledFuture<?> spawnTask;

L2J_DataPack/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java

@@ -28,13 +28,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.engines.DocumentParser;
+import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.model.StatsSet;
 
 /**
  * @author UnAfraid
  */
-public class NpcBuffersData implements DocumentParser
+public class NpcBuffersData implements IXmlReader
 {
 	private final Map<Integer, NpcBufferData> _npcBuffers = new HashMap<>();
 	

L2J_DataPack/dist/game/data/scripts/gracia/AI/Maguen.java

@@ -18,6 +18,7 @@
  */
 package gracia.AI;
 
+import gracia.AI.NPC.Nemo.Nemo;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -31,8 +32,6 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 
-import gracia.AI.NPC.Nemo.Nemo;
-
 /**
  * Maguen AI.
  * @author St3eT

L2J_DataPack/dist/game/data/scripts/gracia/AI/NPC/Nemo/Nemo.java

@@ -18,6 +18,7 @@
  */
 package gracia.AI.NPC.Nemo;
 
+import gracia.AI.Maguen;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.network.NpcStringId;
 
-import gracia.AI.Maguen;
-
 /**
  * Nemo AI.
  * @author St3eT

L2J_DataPack/dist/game/data/scripts/gracia/GraciaLoader.java

@@ -18,9 +18,6 @@
  */
 package gracia;
 
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
 import gracia.AI.EnergySeeds;
 import gracia.AI.Lindvior;
 import gracia.AI.Maguen;
@@ -42,6 +39,9 @@ import gracia.vehicles.KeucereusSouthController.KeucereusSouthController;
 import gracia.vehicles.SoDController.SoDController;
 import gracia.vehicles.SoIController.SoIController;
 
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
 /**
  * Gracia class-loader.
  * @author Pandragon

L2J_DataPack/dist/game/data/scripts/gracia/vehicles/KeucereusNorthController/KeucereusNorthController.java

@@ -18,11 +18,11 @@
  */
 package gracia.vehicles.KeucereusNorthController;
 
+import gracia.vehicles.AirShipController;
+
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
-
 public final class KeucereusNorthController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50602;

L2J_DataPack/dist/game/data/scripts/gracia/vehicles/KeucereusSouthController/KeucereusSouthController.java

@@ -18,11 +18,11 @@
  */
 package gracia.vehicles.KeucereusSouthController;
 
+import gracia.vehicles.AirShipController;
+
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
-
 public final class KeucereusSouthController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50603;

L2J_DataPack/dist/game/data/scripts/gracia/vehicles/SoDController/SoDController.java

@@ -18,11 +18,11 @@
  */
 package gracia.vehicles.SoDController;
 
+import gracia.vehicles.AirShipController;
+
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
-
 public final class SoDController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50601;

L2J_DataPack/dist/game/data/scripts/gracia/vehicles/SoIController/SoIController.java

@@ -18,11 +18,11 @@
  */
 package gracia.vehicles.SoIController;
 
+import gracia.vehicles.AirShipController;
+
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.VehiclePathPoint;
 
-import gracia.vehicles.AirShipController;
-
 public final class SoIController extends AirShipController
 {
 	private static final int DOCK_ZONE = 50600;

L2J_DataPack/dist/game/data/scripts/handlers/actionshifthandlers/L2NpcActionShift.java

@@ -18,6 +18,8 @@
  */
 package handlers.actionshifthandlers;
 
+import handlers.bypasshandlers.NpcViewMod;
+
 import java.util.Set;
 
 import com.l2jserver.Config;
@@ -34,8 +36,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.util.Util;
 
-import handlers.bypasshandlers.NpcViewMod;
-
 public class L2NpcActionShift implements IActionShiftHandler
 {
 	/**

L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminHellbound.java

@@ -18,14 +18,14 @@
  */
 package handlers.admincommandhandlers;
 
+import hellbound.HellboundEngine;
+
 import java.util.StringTokenizer;
 
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 
-import hellbound.HellboundEngine;
-
 /**
  * Hellbound admin command.
  * @author DS, Gladicek

L2J_DataPack/dist/game/data/scripts/handlers/voicedcommandhandlers/Hellbound.java

@@ -18,11 +18,11 @@
  */
 package handlers.voicedcommandhandlers;
 
+import hellbound.HellboundEngine;
+
 import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Hellbound voiced command.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Amaskari.java

@@ -18,6 +18,7 @@
  */
 package hellbound.AI;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ai.CtrlIntention;
@@ -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 hellbound.HellboundEngine;
-
 /**
  * Manages Amaskari's and minions' chat and some skill usage.
  * @author GKR

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Chimeras.java

@@ -18,6 +18,7 @@
  */
 package hellbound.AI;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.Skill;
 
-import hellbound.HellboundEngine;
-
 /**
  * Chimeras AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/HellboundCore.java

@@ -18,6 +18,7 @@
  */
 package hellbound.AI;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
 
-import hellbound.HellboundEngine;
-
 /**
  * Manages Naia's cast on the Hellbound Core
  * @author GKR

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Bernarde/Bernarde.java

@@ -18,13 +18,12 @@
  */
 package hellbound.AI.NPC.Bernarde;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Bernarde AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Buron/Buron.java

@@ -18,13 +18,12 @@
  */
 package hellbound.AI.NPC.Buron;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Buron AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Hude/Hude.java

@@ -18,14 +18,13 @@
  */
 package hellbound.AI.NPC.Hude;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.MultisellData;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Hude AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Jude/Jude.java

@@ -18,13 +18,12 @@
  */
 package hellbound.AI.NPC.Jude;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Jude AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Kief/Kief.java

@@ -18,13 +18,12 @@
  */
 package hellbound.AI.NPC.Kief;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Kief AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Natives/Natives.java

@@ -18,6 +18,7 @@
  */
 package hellbound.AI.NPC.Natives;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.DoorTable;
@@ -27,8 +28,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 
-import hellbound.HellboundEngine;
-
 /**
  * Natives AI.
  * @author DS, GKR

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Quarry/Quarry.java

@@ -18,6 +18,7 @@
  */
 package hellbound.AI.NPC.Quarry;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
@@ -33,8 +34,6 @@ import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 
-import hellbound.HellboundEngine;
-
 /**
  * Quarry AI.
  * @author DS, GKR

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Solomon/Solomon.java

@@ -18,13 +18,12 @@
  */
 package hellbound.AI.NPC.Solomon;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Solomon AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/NPC/Warpgate/Warpgate.java

@@ -18,6 +18,7 @@
  */
 package hellbound.AI.NPC.Warpgate;
 
+import hellbound.HellboundEngine;
 import quests.Q00130_PathToHellbound.Q00130_PathToHellbound;
 import quests.Q00133_ThatsBloodyHot.Q00133_ThatsBloodyHot;
 import ai.npc.AbstractNpcAI;
@@ -31,8 +32,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 
-import hellbound.HellboundEngine;
-
 /**
  * Warpgate teleport AI.
  * @author _DS_

L2J_DataPack/dist/game/data/scripts/hellbound/AI/OutpostCaptain.java

@@ -18,6 +18,7 @@
  */
 package hellbound.AI;
 
+import hellbound.HellboundEngine;
 import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.gameserver.datatables.DoorTable;
@@ -25,8 +26,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-import hellbound.HellboundEngine;
-
 /**
  * Outpost Captain's AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Slaves.java

@@ -18,6 +18,8 @@
  */
 package hellbound.AI;
 
+import hellbound.HellboundEngine;
+
 import java.util.List;
 
 import ai.npc.AbstractNpcAI;
@@ -31,8 +33,6 @@ import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
 
-import hellbound.HellboundEngine;
-
 /**
  * Hellbound Slaves AI.
  * @author DS

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Zones/AnomicFoundry/AnomicFoundry.java

@@ -18,6 +18,8 @@
  */
 package hellbound.AI.Zones.AnomicFoundry;
 
+import hellbound.HellboundEngine;
+
 import java.util.Map;
 
 import javolution.util.FastMap;
@@ -35,8 +37,6 @@ import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 
-import hellbound.HellboundEngine;
-
 /**
  * Anomic Foundry.
  * @author GKR

L2J_DataPack/dist/game/data/scripts/hellbound/AI/Zones/TowerOfInfinitum/TowerOfInfinitum.java

@@ -18,6 +18,8 @@
  */
 package hellbound.AI.Zones.TowerOfInfinitum;
 
+import hellbound.HellboundEngine;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -29,8 +31,6 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.util.Util;
 
-import hellbound.HellboundEngine;
-
 /**
  * Tower Of Infinitum.
  * @author GKR

L2J_DataPack/dist/game/data/scripts/hellbound/HellboundLoader.java

@@ -18,17 +18,6 @@
  */
 package hellbound;
 
-import java.util.logging.Logger;
-
-import quests.Q00130_PathToHellbound.Q00130_PathToHellbound;
-import quests.Q00133_ThatsBloodyHot.Q00133_ThatsBloodyHot;
-
-import com.l2jserver.Config;
-import com.l2jserver.gameserver.handler.AdminCommandHandler;
-import com.l2jserver.gameserver.handler.IAdminCommandHandler;
-import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
-import com.l2jserver.gameserver.handler.VoicedCommandHandler;
-
 import handlers.admincommandhandlers.AdminHellbound;
 import handlers.voicedcommandhandlers.Hellbound;
 import hellbound.AI.Amaskari;
@@ -64,6 +53,17 @@ import hellbound.Instances.DemonPrinceFloor.DemonPrinceFloor;
 import hellbound.Instances.RankuFloor.RankuFloor;
 import hellbound.Instances.UrbanArea.UrbanArea;
 
+import java.util.logging.Logger;
+
+import quests.Q00130_PathToHellbound.Q00130_PathToHellbound;
+import quests.Q00133_ThatsBloodyHot.Q00133_ThatsBloodyHot;
+
+import com.l2jserver.Config;
+import com.l2jserver.gameserver.handler.AdminCommandHandler;
+import com.l2jserver.gameserver.handler.IAdminCommandHandler;
+import com.l2jserver.gameserver.handler.IVoicedCommandHandler;
+import com.l2jserver.gameserver.handler.VoicedCommandHandler;
+
 /**
  * Hellbound class-loader.
  * @author Zoey76

L2J_DataPack/dist/game/data/scripts/hellbound/HellboundPointData.java

@@ -25,13 +25,13 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
-import com.l2jserver.gameserver.engines.DocumentParser;
+import com.l2jserver.gameserver.data.xml.IXmlReader;
 
 /**
  * Point data parser.
  * @author Zoey76
  */
-public final class HellboundPointData implements DocumentParser
+public final class HellboundPointData implements IXmlReader
 {
 	private final Map<Integer, int[]> _pointsInfo = new HashMap<>();
 	

L2J_DataPack/dist/game/data/scripts/hellbound/HellboundSpawns.java

@@ -27,9 +27,9 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
 
+import com.l2jserver.gameserver.data.xml.IXmlReader;
 import com.l2jserver.gameserver.datatables.NpcData;
 import com.l2jserver.gameserver.datatables.SpawnTable;
-import com.l2jserver.gameserver.engines.DocumentParser;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.Location;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
@@ -38,7 +38,7 @@ import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
  * Hellbound Spawns parser.
  * @author Zoey76
  */
-public final class HellboundSpawns implements DocumentParser
+public final class HellboundSpawns implements IXmlReader
 {
 	private final List<L2Spawn> _spawns = new ArrayList<>();
 	private final Map<Integer, int[]> _spawnLevels = new HashMap<>();

L2J_DataPack/dist/game/data/scripts/hellbound/Instances/UrbanArea/UrbanArea.java

@@ -18,6 +18,8 @@
  */
 package hellbound.Instances.UrbanArea;
 
+import hellbound.HellboundEngine;
+
 import java.util.concurrent.ScheduledFuture;
 
 import ai.npc.AbstractNpcAI;
@@ -41,8 +43,6 @@ import com.l2jserver.gameserver.network.serverpackets.NpcSay;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.util.Util;
 
-import hellbound.HellboundEngine;
-
 /**
  * Urban Area instance zone.
  * @author GKR

L2J_DataPack/dist/game/data/scripts/quests/Q00003_WillTheSealBeBroken/Q00003_WillTheSealBeBroken.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00003_WillTheSealBeBroken;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00004_LongLiveThePaagrioLord/Q00004_LongLiveThePaagrioLord.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00004_LongLiveThePaagrioLord;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00104_SpiritOfMirrors/Q00104_SpiritOfMirrors.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.holders.ItemHolder;

L2J_DataPack/dist/game/data/scripts/quests/Q00107_MercilessPunishment/Q00107_MercilessPunishment.java

@@ -20,8 +20,8 @@ package quests.Q00107_MercilessPunishment;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.holders.ItemHolder;

L2J_DataPack/dist/game/data/scripts/quests/Q00130_PathToHellbound/Q00130_PathToHellbound.java

@@ -18,14 +18,14 @@
  */
 package quests.Q00130_PathToHellbound;
 
+import hellbound.HellboundEngine;
+
 import com.l2jserver.gameserver.model.actor.L2Npc;
 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 hellbound.HellboundEngine;
-
 /**
  * Path To Hellbound (130)
  * @author Zoey76

L2J_DataPack/dist/game/data/scripts/quests/Q00133_ThatsBloodyHot/Q00133_ThatsBloodyHot.java

@@ -18,6 +18,7 @@
  */
 package quests.Q00133_ThatsBloodyHot;
 
+import hellbound.HellboundEngine;
 import quests.Q00131_BirdInACage.Q00131_BirdInACage;
 
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -26,8 +27,6 @@ import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
 import com.l2jserver.gameserver.model.quest.State;
 
-import hellbound.HellboundEngine;
-
 /**
  * That's Bloody Hot! (133)
  * @author Zoey76

L2J_DataPack/dist/game/data/scripts/quests/Q00159_ProtectTheWaterSource/Q00159_ProtectTheWaterSource.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00159_ProtectTheWaterSource;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00162_CurseOfTheUndergroundFortress/Q00162_CurseOfTheUndergroundFortress.java

@@ -21,8 +21,8 @@ package quests.Q00162_CurseOfTheUndergroundFortress;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00163_LegacyOfThePoet/Q00163_LegacyOfThePoet.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00163_LegacyOfThePoet;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00165_ShilensHunt/Q00165_ShilensHunt.java

@@ -21,8 +21,8 @@ package quests.Q00165_ShilensHunt;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00169_OffspringOfNightmares/Q00169_OffspringOfNightmares.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00169_OffspringOfNightmares;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00260_OrcHunting/Q00260_OrcHunting.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00263_OrcSubjugation/Q00263_OrcSubjugation.java

@@ -21,8 +21,8 @@ package quests.Q00263_OrcSubjugation;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00265_BondsOfSlavery/Q00265_BondsOfSlavery.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00266_PleasOfPixies/Q00266_PleasOfPixies.java

@@ -23,8 +23,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.holders.ItemHolder;

L2J_DataPack/dist/game/data/scripts/quests/Q00267_WrathOfVerdure/Q00267_WrathOfVerdure.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00267_WrathOfVerdure;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00271_ProofOfValor/Q00271_ProofOfValor.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00271_ProofOfValor;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00272_WrathOfAncestors/Q00272_WrathOfAncestors.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00272_WrathOfAncestors;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00273_InvadersOfTheHolyLand/Q00273_InvadersOfTheHolyLand.java

@@ -23,8 +23,8 @@ import java.util.Map;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00274_SkirmishWithTheWerewolves/Q00274_SkirmishWithTheWerewolves.java

@@ -18,8 +18,8 @@
  */
 package quests.Q00274_SkirmishWithTheWerewolves;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java

@@ -20,8 +20,8 @@ package quests.Q00293_TheHiddenVeins;
 
 import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 
-import com.l2jserver.gameserver.enums.Race;
 import com.l2jserver.gameserver.enums.QuestSound;
+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.quest.Quest;

L2J_DataPack/dist/game/data/scripts/quests/Q00357_WarehouseKeepersAmbition/Q00357_WarehouseKeepersAmbition.java

@@ -46,7 +46,7 @@ public final class Q00357_WarehouseKeepersAmbition extends Quest
 	}
 	// Misc
 	private static final int MIN_LVL = 47;
-
+	
 	public Q00357_WarehouseKeepersAmbition()
 	{
 		super(357, Q00357_WarehouseKeepersAmbition.class.getSimpleName(), "Warehouse Keeper's Ambition");
@@ -55,7 +55,7 @@ public final class Q00357_WarehouseKeepersAmbition extends Quest
 		addKillId(DROP_DATA.keySet());
 		registerQuestItems(JADE_CRYSTAL);
 	}
-
+	
 	@Override
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
 	{
@@ -119,7 +119,7 @@ public final class Q00357_WarehouseKeepersAmbition extends Quest
 		}
 		return htmltext;
 	}
-
+	
 	@Override
 	public String onTalk(L2Npc npc, L2PcInstance talker)
 	{
@@ -135,7 +135,7 @@ public final class Q00357_WarehouseKeepersAmbition extends Quest
 		}
 		return htmltext;
 	}
-
+	
 	@Override
 	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
 	{

L2J_DataPack/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java

@@ -168,16 +168,12 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest
 					creature1.setIsNoRndWalk(true);
 					final L2Npc creature2 = addSpawn(CREATURE_OF_THE_DUSK2, 89524, -238131, -9632, 56, false, 0, false, player.getInstanceId());
 					creature2.setIsNoRndWalk(true);
-					ThreadPoolManager.getInstance().scheduleGeneral(new Runnable()
+					ThreadPoolManager.getInstance().scheduleGeneral(() ->
 					{
-						@Override
-						public void run()
-						{
-							creature1.deleteMe();
-							creature2.deleteMe();
-							st.unset("ex");
-							isBusy = false;
-						}
+						creature1.deleteMe();
+						creature2.deleteMe();
+						st.unset("ex");
+						isBusy = false;
 					}, 60000);
 				}
 				break;