From e2a05903daed86b85860f867fbf12a6e18ebe6c5 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 26 Jun 2017 21:37:44 +0000 Subject: [PATCH] Moved main GeoData class in gameserver geodata package. --- .../dist/game/data/scripts/ai/others/FleeMonsters.java | 2 +- .../scripts/handlers/actionhandlers/L2PcInstanceAction.java | 2 +- .../handlers/actionhandlers/L2PetInstanceAction.java | 2 +- .../scripts/handlers/actionhandlers/L2SummonAction.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminGeodata.java | 2 +- .../handlers/admincommandhandlers/AdminTeleport.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminZones.java | 2 +- .../game/data/scripts/handlers/effecthandlers/Blink.java | 2 +- .../game/data/scripts/handlers/effecthandlers/Fear.java | 2 +- .../game/data/scripts/handlers/effecthandlers/FlyAway.java | 2 +- .../data/scripts/handlers/effecthandlers/KnockBack.java | 2 +- .../game/data/scripts/handlers/effecthandlers/PullBack.java | 2 +- .../scripts/handlers/effecthandlers/TeleportToSummon.java | 2 +- .../scripts/handlers/effecthandlers/TeleportToTarget.java | 2 +- .../skillconditionhandlers/OpBlinkSkillCondition.java | 2 +- .../game/data/scripts/handlers/targethandlers/Enemy.java | 2 +- .../game/data/scripts/handlers/targethandlers/EnemyNot.java | 2 +- .../data/scripts/handlers/targethandlers/EnemyOnly.java | 2 +- .../game/data/scripts/handlers/targethandlers/Ground.java | 2 +- .../game/data/scripts/handlers/targethandlers/NpcBody.java | 2 +- .../game/data/scripts/handlers/targethandlers/PcBody.java | 2 +- .../game/data/scripts/handlers/targethandlers/Target.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Fan.java | 2 +- .../scripts/handlers/targethandlers/affectscope/FanPB.java | 2 +- .../handlers/targethandlers/affectscope/PointBlank.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Range.java | 2 +- .../handlers/targethandlers/affectscope/RingRange.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Square.java | 2 +- .../handlers/targethandlers/affectscope/SquarePB.java | 2 +- .../java/com/l2jmobius/gameserver/GameServer.java | 1 + .../java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2AttackableAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2CharacterAI.java | 2 +- .../com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2SummonAI.java | 2 +- .../com/l2jmobius/gameserver/{ => geodata}/GeoData.java | 2 +- .../geodata/pathfinding/cellnodes/CellPathFinding.java | 2 +- .../gameserver/geodata/pathfinding/cellnodes/NodeLoc.java | 2 +- .../geodata/pathfinding/geonodes/GeoPathFinding.java | 2 +- .../java/com/l2jmobius/gameserver/model/Fishing.java | 2 +- .../java/com/l2jmobius/gameserver/model/L2Spawn.java | 2 +- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Tower.java | 2 +- .../gameserver/model/actor/instance/L2PcInstance.java | 2 +- .../gameserver/model/items/instance/L2ItemInstance.java | 2 +- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 2 +- .../l2jmobius/gameserver/model/skills/SkillChannelizer.java | 2 +- .../l2jmobius/gameserver/model/zone/form/ZoneCuboid.java | 2 +- .../l2jmobius/gameserver/model/zone/form/ZoneCylinder.java | 2 +- .../com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java | 2 +- .../java/com/l2jmobius/gameserver/util/GeoUtils.java | 2 +- .../areas/ImperialTomb/FourSepulchers/FourSepulchers.java | 2 +- .../ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java | 2 +- .../ai/areas/KartiasLabyrinth/KartiaSupportTroop.java | 2 +- .../data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java | 2 +- .../data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Devno.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Eleve.java | 2 +- .../data/scripts/ai/areas/TalkingIsland/Handermonkey.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Karonf.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Marsha.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Morgan.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Rubentis.java | 2 +- .../YeSegiraTeleportDevice/YeSegiraTeleportDevice.java | 6 +++--- .../data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java | 2 +- .../dist/game/data/scripts/ai/bosses/Tiat/Stage1.java | 2 +- .../dist/game/data/scripts/ai/bosses/Valakas/Valakas.java | 2 +- .../dist/game/data/scripts/ai/others/FleeMonsters.java | 2 +- .../scripts/handlers/actionhandlers/L2PcInstanceAction.java | 2 +- .../handlers/actionhandlers/L2PetInstanceAction.java | 2 +- .../scripts/handlers/actionhandlers/L2SummonAction.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminGeodata.java | 2 +- .../handlers/admincommandhandlers/AdminTeleport.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminZones.java | 2 +- .../game/data/scripts/handlers/effecthandlers/Blink.java | 2 +- .../game/data/scripts/handlers/effecthandlers/Fear.java | 2 +- .../game/data/scripts/handlers/effecthandlers/FlyAway.java | 2 +- .../data/scripts/handlers/effecthandlers/KnockBack.java | 2 +- .../game/data/scripts/handlers/effecthandlers/PullBack.java | 2 +- .../scripts/handlers/effecthandlers/TeleportToSummon.java | 2 +- .../scripts/handlers/effecthandlers/TeleportToTarget.java | 2 +- .../skillconditionhandlers/OpBlinkSkillCondition.java | 2 +- .../game/data/scripts/handlers/targethandlers/Enemy.java | 2 +- .../game/data/scripts/handlers/targethandlers/EnemyNot.java | 2 +- .../data/scripts/handlers/targethandlers/EnemyOnly.java | 2 +- .../game/data/scripts/handlers/targethandlers/Ground.java | 2 +- .../game/data/scripts/handlers/targethandlers/NpcBody.java | 2 +- .../game/data/scripts/handlers/targethandlers/PcBody.java | 2 +- .../game/data/scripts/handlers/targethandlers/Target.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Fan.java | 2 +- .../scripts/handlers/targethandlers/affectscope/FanPB.java | 2 +- .../handlers/targethandlers/affectscope/PointBlank.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Range.java | 2 +- .../handlers/targethandlers/affectscope/RingRange.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Square.java | 2 +- .../handlers/targethandlers/affectscope/SquarePB.java | 2 +- .../Q10330_ToTheRuinsOfYeSagira.java | 4 ++-- .../Q10364_ObligationsOfTheSeeker.java | 4 ++-- .../Q10365_ForTheSearchdogKing.java | 4 ++-- .../Q10366_ReportOnTheSituationAtTheRuins.java | 4 ++-- .../Q10541_TrainLikeTheRealThing.java | 4 ++-- .../Q10542_SearchingForNewPower.java | 4 ++-- .../quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java | 4 ++-- .../Q10753_WindsOfFateChoices.java | 2 +- .../java/com/l2jmobius/gameserver/GameServer.java | 1 + .../java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2AttackableAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2CharacterAI.java | 2 +- .../com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2SummonAI.java | 2 +- .../com/l2jmobius/gameserver/{ => geodata}/GeoData.java | 2 +- .../geodata/pathfinding/cellnodes/CellPathFinding.java | 2 +- .../gameserver/geodata/pathfinding/cellnodes/NodeLoc.java | 2 +- .../geodata/pathfinding/geonodes/GeoPathFinding.java | 2 +- .../java/com/l2jmobius/gameserver/model/Fishing.java | 2 +- .../java/com/l2jmobius/gameserver/model/L2Spawn.java | 2 +- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Tower.java | 2 +- .../gameserver/model/actor/instance/L2PcInstance.java | 2 +- .../gameserver/model/items/instance/L2ItemInstance.java | 2 +- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 2 +- .../l2jmobius/gameserver/model/skills/SkillChannelizer.java | 2 +- .../l2jmobius/gameserver/model/zone/form/ZoneCuboid.java | 2 +- .../l2jmobius/gameserver/model/zone/form/ZoneCylinder.java | 2 +- .../com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java | 2 +- .../java/com/l2jmobius/gameserver/util/GeoUtils.java | 2 +- .../areas/ImperialTomb/FourSepulchers/FourSepulchers.java | 2 +- .../ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java | 2 +- .../ai/areas/KartiasLabyrinth/KartiaSupportTroop.java | 2 +- .../data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java | 2 +- .../data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java | 2 +- .../data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Devno.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Eleve.java | 2 +- .../data/scripts/ai/areas/TalkingIsland/Handermonkey.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Karonf.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Marsha.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Morgan.java | 2 +- .../game/data/scripts/ai/areas/TalkingIsland/Rubentis.java | 2 +- .../data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java | 2 +- .../dist/game/data/scripts/ai/bosses/Tiat/Stage1.java | 2 +- .../dist/game/data/scripts/ai/bosses/Valakas/Valakas.java | 2 +- .../dist/game/data/scripts/ai/others/FleeMonsters.java | 2 +- .../scripts/handlers/actionhandlers/L2PcInstanceAction.java | 2 +- .../handlers/actionhandlers/L2PetInstanceAction.java | 2 +- .../scripts/handlers/actionhandlers/L2SummonAction.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminGeodata.java | 2 +- .../handlers/admincommandhandlers/AdminTeleport.java | 2 +- .../scripts/handlers/admincommandhandlers/AdminZones.java | 2 +- .../game/data/scripts/handlers/effecthandlers/Blink.java | 2 +- .../game/data/scripts/handlers/effecthandlers/Fear.java | 2 +- .../game/data/scripts/handlers/effecthandlers/FlyAway.java | 2 +- .../data/scripts/handlers/effecthandlers/KnockBack.java | 2 +- .../game/data/scripts/handlers/effecthandlers/PullBack.java | 2 +- .../scripts/handlers/effecthandlers/TeleportToSummon.java | 2 +- .../scripts/handlers/effecthandlers/TeleportToTarget.java | 2 +- .../skillconditionhandlers/OpBlinkSkillCondition.java | 2 +- .../game/data/scripts/handlers/targethandlers/Enemy.java | 2 +- .../game/data/scripts/handlers/targethandlers/EnemyNot.java | 2 +- .../data/scripts/handlers/targethandlers/EnemyOnly.java | 2 +- .../game/data/scripts/handlers/targethandlers/Ground.java | 2 +- .../game/data/scripts/handlers/targethandlers/NpcBody.java | 2 +- .../game/data/scripts/handlers/targethandlers/PcBody.java | 2 +- .../game/data/scripts/handlers/targethandlers/Target.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Fan.java | 2 +- .../scripts/handlers/targethandlers/affectscope/FanPB.java | 2 +- .../handlers/targethandlers/affectscope/PointBlank.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Range.java | 2 +- .../handlers/targethandlers/affectscope/RingRange.java | 2 +- .../scripts/handlers/targethandlers/affectscope/Square.java | 2 +- .../handlers/targethandlers/affectscope/SquarePB.java | 2 +- .../Q10753_WindsOfFateChoices.java | 2 +- .../java/com/l2jmobius/gameserver/GameServer.java | 1 + .../java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2AttackableAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2CharacterAI.java | 2 +- .../com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java | 2 +- .../java/com/l2jmobius/gameserver/ai/L2SummonAI.java | 2 +- .../com/l2jmobius/gameserver/{ => geodata}/GeoData.java | 2 +- .../geodata/pathfinding/cellnodes/CellPathFinding.java | 2 +- .../gameserver/geodata/pathfinding/cellnodes/NodeLoc.java | 2 +- .../geodata/pathfinding/geonodes/GeoPathFinding.java | 2 +- .../java/com/l2jmobius/gameserver/model/Fishing.java | 2 +- .../java/com/l2jmobius/gameserver/model/L2Spawn.java | 2 +- .../com/l2jmobius/gameserver/model/actor/L2Character.java | 2 +- .../java/com/l2jmobius/gameserver/model/actor/L2Tower.java | 2 +- .../gameserver/model/actor/instance/L2PcInstance.java | 2 +- .../gameserver/model/items/instance/L2ItemInstance.java | 2 +- .../com/l2jmobius/gameserver/model/skills/SkillCaster.java | 2 +- .../l2jmobius/gameserver/model/skills/SkillChannelizer.java | 2 +- .../l2jmobius/gameserver/model/zone/form/ZoneCuboid.java | 2 +- .../l2jmobius/gameserver/model/zone/form/ZoneCylinder.java | 2 +- .../com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java | 2 +- .../java/com/l2jmobius/gameserver/util/GeoUtils.java | 2 +- 198 files changed, 207 insertions(+), 204 deletions(-) rename L2J_Mobius_Classic/java/com/l2jmobius/gameserver/{ => geodata}/GeoData.java (99%) rename L2J_Mobius_Helios/java/com/l2jmobius/gameserver/{ => geodata}/GeoData.java (99%) rename L2J_Mobius_Underground/java/com/l2jmobius/gameserver/{ => geodata}/GeoData.java (99%) diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/FleeMonsters.java b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/FleeMonsters.java index 4a9fd32da5..09850d9d19 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/FleeMonsters.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/ai/others/FleeMonsters.java @@ -16,8 +16,8 @@ */ package ai.others; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java index dcfd176809..eb06ec5594 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java @@ -16,10 +16,10 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.PrivateStoreType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java index 27713672ec..c21b0e6ca1 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java index 0c7b9bb048..b6af1a7ca4 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java index e1ff87e38d..d1b0dce98c 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.cache.HtmCache; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index 24371da55a..1b738a0264 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -25,11 +25,11 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.enums.AdminTeleportType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.DBSpawnManager; import com.l2jmobius.gameserver.instancemanager.MapRegionManager; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index dc9caaea74..d6949af214 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -33,8 +33,8 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.PlayerAction; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 3a876f642b..0e1c1d1aca 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 92a1f1d923..7525c0f5ec 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -16,10 +16,10 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.Race; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 82cb374eb7..1da9965557 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 92cf670492..ad73aef663 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -16,9 +16,9 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index eb34debafb..7850b26d5d 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index a8d13f97c3..8144305363 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index fc5dee6a49..93ffb3174d 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1fbe8d8304..4b33ad31b2 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -16,8 +16,8 @@ */ package handlers.skillconditionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.Position; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Enemy.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Enemy.java index 8ee0ca4c7c..b16408fba4 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Enemy.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Enemy.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java index 3cb02d342d..005d4e0ee1 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java index 877f46306a..2f5a79d6f5 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Ground.java index aec6081cb7..f3b38dcf71 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Ground.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Ground.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.L2Object; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/NpcBody.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/NpcBody.java index a3b42994ac..699fa269c7 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/NpcBody.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/NpcBody.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/PcBody.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/PcBody.java index 9e681ff8b9..8c4fdb083a 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/PcBody.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/PcBody.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Target.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Target.java index 0d3b6b40c4..b388976172 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Target.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/Target.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java index 18c1d95224..2487c40d5e 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java index 7070558f4b..ec987c91eb 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java index cc087add71..d6c63186a2 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java index 21cdc0b095..90abebd98f 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java index 0f97c460cd..6cbe61fe1c 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java index bbdc34784d..3225de6245 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java index d69b8b399b..7ffad78a8f 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/GameServer.java index 6bad121fcb..bd36ba4540 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/GameServer.java @@ -98,6 +98,7 @@ import com.l2jmobius.gameserver.datatables.BotReportTable; import com.l2jmobius.gameserver.datatables.EventDroplist; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.datatables.MerchantPriceConfigTable; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.handler.ConditionHandler; import com.l2jmobius.gameserver.handler.DailyMissionHandler; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java index 165e03c850..3eebee88ea 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java @@ -21,7 +21,7 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK; import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_REST; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 9a55a1c89d..58d04c2c03 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -31,9 +31,9 @@ import java.util.stream.Stream; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.AISkillScope; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.AggroInfo; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 5b6066bc55..6438f27825 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -31,9 +31,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.ItemLocation; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.WalkingManager; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index f44be85e9f..9776e16aa8 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Attackable; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 707050c66f..f6d5a3b6f1 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Attackable; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index f5b3afcaf2..26c09985b0 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -23,8 +23,8 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/GeoData.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/GeoData.java similarity index 99% rename from L2J_Mobius_Classic/java/com/l2jmobius/gameserver/GeoData.java rename to L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/GeoData.java index bbf22617b9..a44ba3b703 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/GeoData.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/GeoData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver; +package com.l2jmobius.gameserver.geodata; import java.nio.file.Files; import java.nio.file.Path; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java index f36ec872ba..9eb6b0d04a 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java @@ -25,7 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java index fb063e9a41..353dee1d7f 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.geodata.pathfinding.cellnodes; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.geodriver.Cell; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java index 66a7aa7905..f2d6c87e78 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java @@ -35,7 +35,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/Fishing.java index 02554edd96..1f87ec266a 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/Fishing.java @@ -22,10 +22,10 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FishingData; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.events.EventDispatcher; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/L2Spawn.java index 088508b04e..c62f2adbbe 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -24,9 +24,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Character.java index ca1f436bfa..6fa47963d7 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -44,7 +44,6 @@ import com.l2jmobius.Config; import com.l2jmobius.commons.util.EmptyQueue; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -63,6 +62,7 @@ import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.idfactory.IdFactory; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Tower.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Tower.java index 9b5e029a01..ac1d703e27 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Tower.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/L2Tower.java @@ -16,8 +16,8 @@ */ package com.l2jmobius.gameserver.model.actor; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 88dff10363..b34d09f34d 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -48,7 +48,6 @@ import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ItemsAutoDestroy; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.RecipeController; @@ -98,6 +97,7 @@ import com.l2jmobius.gameserver.enums.StatusUpdateType; import com.l2jmobius.gameserver.enums.SubclassInfoType; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IItemHandler; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 1806747fcb..b8f458239e 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -37,7 +37,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.AppearanceItemData; import com.l2jmobius.gameserver.data.xml.impl.EnchantItemOptionsData; @@ -50,6 +49,7 @@ import com.l2jmobius.gameserver.enums.ItemLocation; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 062dba1ee7..ec30530b46 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -38,6 +37,7 @@ import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.enums.NextActionType; import com.l2jmobius.gameserver.enums.StatusUpdateType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index bedc5a59ca..a2b9564f4f 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -22,10 +22,10 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java index 07ed8f6037..58d967f84d 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java @@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Rectangle; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java index 70910fd7e6..681f9a69de 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java @@ -17,7 +17,7 @@ package com.l2jmobius.gameserver.model.zone.form; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 56fd666598..6da33d788e 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Polygon; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/GeoUtils.java b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/GeoUtils.java index c706c4a491..21540f2215 100644 --- a/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/GeoUtils.java +++ b/L2J_Mobius_Classic/java/com/l2jmobius/gameserver/util/GeoUtils.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.util; import java.awt.Color; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.geodriver.Cell; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index 75f380bbce..81460f0f4d 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -28,10 +28,10 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.commons.util.IGameXmlReader; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java index bf71a7e3c7..2a3e8902fa 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java @@ -19,8 +19,8 @@ package ai.areas.KartiasLabyrinth; import java.util.List; import com.l2jmobius.commons.util.CommonUtil; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java index 8e1dd3c77f..4359ebca01 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java @@ -18,8 +18,8 @@ package ai.areas.KartiasLabyrinth; import java.util.List; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java index 21b747734a..d6334e36c2 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java @@ -17,8 +17,8 @@ package ai.areas.PlainsOfDion; import com.l2jmobius.commons.util.CommonUtil; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 154925d850..d02786fc20 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -17,9 +17,9 @@ package ai.areas.PrimevalIsle; import com.l2jmobius.commons.util.CommonUtil; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.ItemHandler; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java index 2b53dc9053..64c6501bd8 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java index f4bd8ac11c..3dd3b671cb 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java index dc1e1088b3..7900817585 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java index 0768276a95..cb173a5030 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java @@ -16,7 +16,7 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java index 2ae23ae408..7297eeca95 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java index 1e89bfc461..dbbba8d5f0 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java index 29c29cbf26..f976d88263 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java index edbc33e094..19b9fd7893 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java index 7d9b6c2a5a..36f2b0c73a 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/areas/TalkingIsland/YeSegiraTeleportDevice/YeSegiraTeleportDevice.java @@ -19,9 +19,6 @@ package ai.areas.TalkingIsland.YeSegiraTeleportDevice; import java.util.HashMap; import java.util.Map; -import quests.Q10365_ForTheSearchdogKing.Q10365_ForTheSearchdogKing; -import ai.AbstractNpcAI; - import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.instancemanager.QuestManager; @@ -36,6 +33,9 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerCreat import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; +import ai.AbstractNpcAI; +import quests.Q10365_ForTheSearchdogKing.Q10365_ForTheSearchdogKing; + /** * Ye Segira Teleport Device AI. * @author St3eT diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index bb37c2bac6..175973cc3d 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -22,8 +22,8 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.data.xml.impl.SkillData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index 11ed766aa7..6eb16f838e 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -30,10 +30,10 @@ import org.w3c.dom.Node; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.IGameXmlReader; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.TrapAction; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.GraciaSeedsManager; import com.l2jmobius.gameserver.model.L2Territory; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 2603aacb81..9f5375d349 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.List; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.MountType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.GrandBossManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/ai/others/FleeMonsters.java b/L2J_Mobius_Helios/dist/game/data/scripts/ai/others/FleeMonsters.java index 4a9fd32da5..09850d9d19 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/ai/others/FleeMonsters.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/ai/others/FleeMonsters.java @@ -16,8 +16,8 @@ */ package ai.others; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java index dcfd176809..eb06ec5594 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java @@ -16,10 +16,10 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.PrivateStoreType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java index 27713672ec..c21b0e6ca1 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java index 0c7b9bb048..b6af1a7ca4 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java index e1ff87e38d..d1b0dce98c 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.cache.HtmCache; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index 24371da55a..1b738a0264 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -25,11 +25,11 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.enums.AdminTeleportType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.DBSpawnManager; import com.l2jmobius.gameserver.instancemanager.MapRegionManager; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index dc9caaea74..d6949af214 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -33,8 +33,8 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.PlayerAction; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 3a876f642b..0e1c1d1aca 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 92a1f1d923..7525c0f5ec 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -16,10 +16,10 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.Race; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 82cb374eb7..1da9965557 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 92cf670492..ad73aef663 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -16,9 +16,9 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index eb34debafb..7850b26d5d 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index a8d13f97c3..8144305363 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index fc5dee6a49..93ffb3174d 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1fbe8d8304..4b33ad31b2 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -16,8 +16,8 @@ */ package handlers.skillconditionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.Position; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Enemy.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Enemy.java index 8ee0ca4c7c..b16408fba4 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Enemy.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Enemy.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java index 3cb02d342d..005d4e0ee1 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java index 877f46306a..2f5a79d6f5 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java index aec6081cb7..f3b38dcf71 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Ground.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.L2Object; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/NpcBody.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/NpcBody.java index a3b42994ac..699fa269c7 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/NpcBody.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/NpcBody.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/PcBody.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/PcBody.java index 9e681ff8b9..8c4fdb083a 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/PcBody.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/PcBody.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Target.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Target.java index 0d3b6b40c4..b388976172 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Target.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/Target.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java index 18c1d95224..2487c40d5e 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java index 7070558f4b..ec987c91eb 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java index cc087add71..d6c63186a2 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java index 21cdc0b095..90abebd98f 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java index 0f97c460cd..6cbe61fe1c 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java index bbdc34784d..3225de6245 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java index d69b8b399b..7ffad78a8f 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java index 6316d420ac..70e97e6dc3 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10330_ToTheRuinsOfYeSagira/Q10330_ToTheRuinsOfYeSagira.java @@ -16,8 +16,6 @@ */ package quests.Q10330_ToTheRuinsOfYeSagira; -import quests.Q10544_SeekerSupplies.Q10544_SeekerSupplies; - import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -25,6 +23,8 @@ import com.l2jmobius.gameserver.model.quest.Quest; import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; +import quests.Q10544_SeekerSupplies.Q10544_SeekerSupplies; + /** * To the Ruins of Ye Sagira (10330) * @author Gladicek diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java index ea67fabfb6..5ead1339a5 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10364_ObligationsOfTheSeeker/Q10364_ObligationsOfTheSeeker.java @@ -16,8 +16,6 @@ */ package quests.Q10364_ObligationsOfTheSeeker; -import quests.Q10363_RequestOfTheSeeker.Q10363_RequestOfTheSeeker; - import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; @@ -26,6 +24,8 @@ import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q10363_RequestOfTheSeeker.Q10363_RequestOfTheSeeker; + /** * Obligations of the Seeker (10364) * @URL https://l2wiki.com/Obligations_of_the_Seeker diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java index c89d168fa3..b6e788a8e7 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10365_ForTheSearchdogKing/Q10365_ForTheSearchdogKing.java @@ -16,8 +16,6 @@ */ package quests.Q10365_ForTheSearchdogKing; -import quests.Q10364_ObligationsOfTheSeeker.Q10364_ObligationsOfTheSeeker; - import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Quest; @@ -26,6 +24,8 @@ import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q10364_ObligationsOfTheSeeker.Q10364_ObligationsOfTheSeeker; + /** * For the Searchdog King (10365) * @author Stayway diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java index 03d459d4b9..655c16da67 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10366_ReportOnTheSituationAtTheRuins/Q10366_ReportOnTheSituationAtTheRuins.java @@ -19,8 +19,6 @@ package quests.Q10366_ReportOnTheSituationAtTheRuins; import java.util.HashSet; import java.util.Set; -import quests.Q10365_ForTheSearchdogKing.Q10365_ForTheSearchdogKing; - import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -30,6 +28,8 @@ import com.l2jmobius.gameserver.model.quest.QuestState; import com.l2jmobius.gameserver.model.quest.State; import com.l2jmobius.gameserver.network.NpcStringId; +import quests.Q10365_ForTheSearchdogKing.Q10365_ForTheSearchdogKing; + /** * Report on the situation at the ruins (10366) * @URL https://l2wiki.com/Report_on_the_situation_at_the_ruins diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java index 95a3d274b4..2b389a8791 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10541_TrainLikeTheRealThing/Q10541_TrainLikeTheRealThing.java @@ -19,8 +19,6 @@ package quests.Q10541_TrainLikeTheRealThing; import java.util.HashSet; import java.util.Set; -import quests.Q10321_QualificationsOfTheSeeker.Q10321_QualificationsOfTheSeeker; - import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; @@ -36,6 +34,8 @@ import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; +import quests.Q10321_QualificationsOfTheSeeker.Q10321_QualificationsOfTheSeeker; + /** * Train Like the Real Thing (10541) * @URL https://l2wiki.com/Train_Like_the_Real_Thing diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java index d6de553296..c897c31cab 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10542_SearchingForNewPower/Q10542_SearchingForNewPower.java @@ -19,8 +19,6 @@ package quests.Q10542_SearchingForNewPower; import java.util.HashSet; import java.util.Set; -import quests.Q10541_TrainLikeTheRealThing.Q10541_TrainLikeTheRealThing; - import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; @@ -33,6 +31,8 @@ import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; +import quests.Q10541_TrainLikeTheRealThing.Q10541_TrainLikeTheRealThing; + /** * Searching for New Power (10542) * @URL https://l2wiki.com/Searching_for_New_Power diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java index 30d12c5139..cde4107594 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10543_SheddingWeight/Q10543_SheddingWeight.java @@ -16,8 +16,6 @@ */ package quests.Q10543_SheddingWeight; -import quests.Q10542_SearchingForNewPower.Q10542_SearchingForNewPower; - import com.l2jmobius.gameserver.enums.Race; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; @@ -28,6 +26,8 @@ import com.l2jmobius.gameserver.network.NpcStringId; import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import com.l2jmobius.gameserver.network.serverpackets.TutorialShowHtml; +import quests.Q10542_SearchingForNewPower.Q10542_SearchingForNewPower; + /** * Shedding Weight (10543) * @URL https://l2wiki.com/Shedding_Weight diff --git a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 9ee1aa5501..2020a1e4c5 100644 --- a/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_Helios/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -20,11 +20,11 @@ import java.util.HashSet; import java.util.Set; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.HtmlActionScope; import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/GameServer.java index 5932d62564..180aaf5b61 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/GameServer.java @@ -98,6 +98,7 @@ import com.l2jmobius.gameserver.datatables.BotReportTable; import com.l2jmobius.gameserver.datatables.EventDroplist; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.datatables.MerchantPriceConfigTable; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.handler.ConditionHandler; import com.l2jmobius.gameserver.handler.DailyMissionHandler; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java index 165e03c850..3eebee88ea 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java @@ -21,7 +21,7 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK; import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_REST; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 9a55a1c89d..58d04c2c03 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -31,9 +31,9 @@ import java.util.stream.Stream; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.AISkillScope; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.AggroInfo; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 5b6066bc55..6438f27825 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -31,9 +31,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.ItemLocation; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.WalkingManager; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index f44be85e9f..9776e16aa8 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Attackable; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 707050c66f..f6d5a3b6f1 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Attackable; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index f5b3afcaf2..26c09985b0 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -23,8 +23,8 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/GeoData.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/GeoData.java similarity index 99% rename from L2J_Mobius_Helios/java/com/l2jmobius/gameserver/GeoData.java rename to L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/GeoData.java index bbf22617b9..a44ba3b703 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/GeoData.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/GeoData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver; +package com.l2jmobius.gameserver.geodata; import java.nio.file.Files; import java.nio.file.Path; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java index f36ec872ba..9eb6b0d04a 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java @@ -25,7 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java index fb063e9a41..353dee1d7f 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.geodata.pathfinding.cellnodes; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.geodriver.Cell; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java index 66a7aa7905..f2d6c87e78 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java @@ -35,7 +35,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/Fishing.java index 02554edd96..1f87ec266a 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/Fishing.java @@ -22,10 +22,10 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FishingData; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.events.EventDispatcher; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java index 088508b04e..c62f2adbbe 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -24,9 +24,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java index ca1f436bfa..6fa47963d7 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -44,7 +44,6 @@ import com.l2jmobius.Config; import com.l2jmobius.commons.util.EmptyQueue; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -63,6 +62,7 @@ import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.idfactory.IdFactory; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Tower.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Tower.java index 9b5e029a01..ac1d703e27 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Tower.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/L2Tower.java @@ -16,8 +16,8 @@ */ package com.l2jmobius.gameserver.model.actor; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index 88dff10363..b34d09f34d 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -48,7 +48,6 @@ import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ItemsAutoDestroy; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.RecipeController; @@ -98,6 +97,7 @@ import com.l2jmobius.gameserver.enums.StatusUpdateType; import com.l2jmobius.gameserver.enums.SubclassInfoType; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IItemHandler; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 1806747fcb..b8f458239e 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -37,7 +37,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.AppearanceItemData; import com.l2jmobius.gameserver.data.xml.impl.EnchantItemOptionsData; @@ -50,6 +49,7 @@ import com.l2jmobius.gameserver.enums.ItemLocation; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 062dba1ee7..ec30530b46 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -38,6 +37,7 @@ import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.enums.NextActionType; import com.l2jmobius.gameserver.enums.StatusUpdateType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index bedc5a59ca..a2b9564f4f 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -22,10 +22,10 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java index 07ed8f6037..58d967f84d 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java @@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Rectangle; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java index 70910fd7e6..681f9a69de 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java @@ -17,7 +17,7 @@ package com.l2jmobius.gameserver.model.zone.form; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 56fd666598..6da33d788e 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Polygon; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/GeoUtils.java b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/GeoUtils.java index c706c4a491..21540f2215 100644 --- a/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/GeoUtils.java +++ b/L2J_Mobius_Helios/java/com/l2jmobius/gameserver/util/GeoUtils.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.util; import java.awt.Color; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.geodriver.Cell; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java index 75f380bbce..81460f0f4d 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/ImperialTomb/FourSepulchers/FourSepulchers.java @@ -28,10 +28,10 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import com.l2jmobius.commons.util.IGameXmlReader; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.GlobalVariablesManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java index bf71a7e3c7..2a3e8902fa 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaHelperAdolph.java @@ -19,8 +19,8 @@ package ai.areas.KartiasLabyrinth; import java.util.List; import com.l2jmobius.commons.util.CommonUtil; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java index 8e1dd3c77f..4359ebca01 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/KartiasLabyrinth/KartiaSupportTroop.java @@ -18,8 +18,8 @@ package ai.areas.KartiasLabyrinth; import java.util.List; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java index 21b747734a..d6334e36c2 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PlainsOfDion/PlainsOfDion.java @@ -17,8 +17,8 @@ package ai.areas.PlainsOfDion; import com.l2jmobius.commons.util.CommonUtil; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2MonsterInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java index 154925d850..d02786fc20 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java @@ -17,9 +17,9 @@ package ai.areas.PrimevalIsle; import com.l2jmobius.commons.util.CommonUtil; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IItemHandler; import com.l2jmobius.gameserver.handler.ItemHandler; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java index 2b53dc9053..64c6501bd8 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/BoyAndGirl.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java index f4bd8ac11c..3dd3b671cb 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Devno.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java index dc1e1088b3..7900817585 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Eleve.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java index 0768276a95..cb173a5030 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Handermonkey.java @@ -16,7 +16,7 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java index 2ae23ae408..7297eeca95 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Karonf.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java index 1e89bfc461..dbbba8d5f0 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Marsha.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java index 29c29cbf26..f976d88263 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Morgan.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java index edbc33e094..19b9fd7893 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/areas/TalkingIsland/Rubentis.java @@ -16,8 +16,8 @@ */ package ai.areas.TalkingIsland; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.ChatType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java index bb37c2bac6..175973cc3d 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Frintezza/ScarletVanHalisha.java @@ -22,8 +22,8 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.ArrayList; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.data.xml.impl.SkillData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java index 11ed766aa7..6eb16f838e 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java @@ -30,10 +30,10 @@ import org.w3c.dom.Node; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.IGameXmlReader; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.Movie; import com.l2jmobius.gameserver.enums.TrapAction; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.GraciaSeedsManager; import com.l2jmobius.gameserver.model.L2Territory; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java index 2603aacb81..9f5375d349 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/bosses/Valakas/Valakas.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.List; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.MountType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.GrandBossManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/FleeMonsters.java b/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/FleeMonsters.java index 4a9fd32da5..09850d9d19 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/FleeMonsters.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/ai/others/FleeMonsters.java @@ -16,8 +16,8 @@ */ package ai.others; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java index dcfd176809..eb06ec5594 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PcInstanceAction.java @@ -16,10 +16,10 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; import com.l2jmobius.gameserver.enums.PrivateStoreType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java index 27713672ec..c21b0e6ca1 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2PetInstanceAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java index 0c7b9bb048..b6af1a7ca4 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/actionhandlers/L2SummonAction.java @@ -16,9 +16,9 @@ */ package handlers.actionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.InstanceType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IActionHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java index e1ff87e38d..d1b0dce98c 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminGeodata.java @@ -21,8 +21,8 @@ import java.util.Collections; import java.util.List; import java.util.StringTokenizer; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.cache.HtmCache; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java index 24371da55a..1b738a0264 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminTeleport.java @@ -25,11 +25,11 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.data.xml.impl.NpcData; import com.l2jmobius.gameserver.datatables.SpawnTable; import com.l2jmobius.gameserver.enums.AdminTeleportType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.DBSpawnManager; import com.l2jmobius.gameserver.instancemanager.MapRegionManager; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java index dc9caaea74..d6949af214 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/admincommandhandlers/AdminZones.java @@ -33,8 +33,8 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.CommonUtil; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.PlayerAction; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java index 3a876f642b..0e1c1d1aca 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Blink.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 92a1f1d923..7525c0f5ec 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -16,10 +16,10 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; import com.l2jmobius.gameserver.enums.Race; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java index 82cb374eb7..1da9965557 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/FlyAway.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java index 92cf670492..ad73aef663 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/KnockBack.java @@ -16,9 +16,9 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java index eb34debafb..7850b26d5d 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/PullBack.java @@ -16,7 +16,7 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java index a8d13f97c3..8144305363 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToSummon.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java index fc5dee6a49..93ffb3174d 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/effecthandlers/TeleportToTarget.java @@ -16,8 +16,8 @@ */ package handlers.effecthandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java index 1fbe8d8304..4b33ad31b2 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpBlinkSkillCondition.java @@ -16,8 +16,8 @@ */ package handlers.skillconditionhandlers; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.Position; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Enemy.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Enemy.java index 8ee0ca4c7c..b16408fba4 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Enemy.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Enemy.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java index 3cb02d342d..005d4e0ee1 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyNot.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java index 877f46306a..2f5a79d6f5 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/EnemyOnly.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java index aec6081cb7..f3b38dcf71 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Ground.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.L2Object; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/NpcBody.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/NpcBody.java index a3b42994ac..699fa269c7 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/NpcBody.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/NpcBody.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/PcBody.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/PcBody.java index 9e681ff8b9..8c4fdb083a 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/PcBody.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/PcBody.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Target.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Target.java index 0d3b6b40c4..b388976172 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Target.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/Target.java @@ -16,7 +16,7 @@ */ package handlers.targethandlers; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.ITargetTypeHandler; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java index 18c1d95224..2487c40d5e 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Fan.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java index 7070558f4b..ec987c91eb 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/FanPB.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java index cc087add71..d6c63186a2 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/PointBlank.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java index 21cdc0b095..90abebd98f 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Range.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java index 0f97c460cd..6cbe61fe1c 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/RingRange.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java index bbdc34784d..3225de6245 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/Square.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java index d69b8b399b..7ffad78a8f 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/handlers/targethandlers/affectscope/SquarePB.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.function.Predicate; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectObjectHandler; import com.l2jmobius.gameserver.handler.IAffectScopeHandler; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java index 9ee1aa5501..2020a1e4c5 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10753_WindsOfFateChoices/Q10753_WindsOfFateChoices.java @@ -20,11 +20,11 @@ import java.util.HashSet; import java.util.Set; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.enums.CategoryType; import com.l2jmobius.gameserver.enums.HtmlActionScope; import com.l2jmobius.gameserver.enums.QuestSound; import com.l2jmobius.gameserver.enums.Race; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java index 5932d62564..180aaf5b61 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GameServer.java @@ -98,6 +98,7 @@ import com.l2jmobius.gameserver.datatables.BotReportTable; import com.l2jmobius.gameserver.datatables.EventDroplist; import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.datatables.MerchantPriceConfigTable; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.handler.ConditionHandler; import com.l2jmobius.gameserver.handler.DailyMissionHandler; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java index 165e03c850..3eebee88ea 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/FriendlyNpcAI.java @@ -21,7 +21,7 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_ATTACK; import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_REST; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java index 9a55a1c89d..58d04c2c03 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2AttackableAI.java @@ -31,9 +31,9 @@ import java.util.stream.Stream; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.AISkillScope; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.AggroInfo; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java index 5b6066bc55..6438f27825 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2CharacterAI.java @@ -31,9 +31,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.enums.ItemLocation; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.WalkingManager; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java index f44be85e9f..9776e16aa8 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2FortSiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Attackable; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java index 707050c66f..f6d5a3b6f1 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SiegeGuardAI.java @@ -25,8 +25,8 @@ import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.actor.L2Attackable; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java index f5b3afcaf2..26c09985b0 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/ai/L2SummonAI.java @@ -23,8 +23,8 @@ import static com.l2jmobius.gameserver.ai.CtrlIntention.AI_INTENTION_IDLE; import java.util.concurrent.Future; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GeoData.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/GeoData.java similarity index 99% rename from L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GeoData.java rename to L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/GeoData.java index bbf22617b9..a44ba3b703 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/GeoData.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/GeoData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package com.l2jmobius.gameserver; +package com.l2jmobius.gameserver.geodata; import java.nio.file.Files; import java.nio.file.Path; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java index e02aaaf2b5..1e7da4ca3b 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/CellPathFinding.java @@ -25,7 +25,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java index bb36538728..f0720ae1ae 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/cellnodes/NodeLoc.java @@ -16,7 +16,7 @@ */ package com.l2jmobius.gameserver.geodata.pathfinding.cellnodes; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.geodriver.Cell; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java index ceefeecf43..8641ce07e0 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/geodata/pathfinding/geonodes/GeoPathFinding.java @@ -35,7 +35,7 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.Config; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNode; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/Fishing.java index 02554edd96..1f87ec266a 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/Fishing.java @@ -22,10 +22,10 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.FishingData; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.events.EventDispatcher; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java index 088508b04e..c62f2adbbe 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/L2Spawn.java @@ -24,9 +24,9 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.NpcData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.actor.instance.L2NpcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java index ca1f436bfa..6fa47963d7 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java @@ -44,7 +44,6 @@ import com.l2jmobius.Config; import com.l2jmobius.commons.util.EmptyQueue; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -63,6 +62,7 @@ import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.StatusUpdateType; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.pathfinding.AbstractNodeLoc; import com.l2jmobius.gameserver.geodata.pathfinding.PathFinding; import com.l2jmobius.gameserver.idfactory.IdFactory; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Tower.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Tower.java index 9b5e029a01..ac1d703e27 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Tower.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/L2Tower.java @@ -16,8 +16,8 @@ */ package com.l2jmobius.gameserver.model.actor; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ai.CtrlIntention; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate; import com.l2jmobius.gameserver.network.serverpackets.ActionFailed; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index e6b8acf241..59500f4667 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -48,7 +48,6 @@ import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.GameTimeController; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ItemsAutoDestroy; import com.l2jmobius.gameserver.LoginServerThread; import com.l2jmobius.gameserver.RecipeController; @@ -98,6 +97,7 @@ import com.l2jmobius.gameserver.enums.StatusUpdateType; import com.l2jmobius.gameserver.enums.SubclassInfoType; import com.l2jmobius.gameserver.enums.Team; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.handler.AdminCommandHandler; import com.l2jmobius.gameserver.handler.IAdminCommandHandler; import com.l2jmobius.gameserver.handler.IItemHandler; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java index 1806747fcb..b8f458239e 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java @@ -37,7 +37,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.database.DatabaseFactory; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.AppearanceItemData; import com.l2jmobius.gameserver.data.xml.impl.EnchantItemOptionsData; @@ -50,6 +49,7 @@ import com.l2jmobius.gameserver.enums.ItemLocation; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.enums.ShotType; import com.l2jmobius.gameserver.enums.UserInfoType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.idfactory.IdFactory; import com.l2jmobius.gameserver.instancemanager.CastleManager; import com.l2jmobius.gameserver.instancemanager.ItemsOnGroundManager; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java index 062dba1ee7..ec30530b46 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java @@ -29,7 +29,6 @@ import java.util.logging.Logger; import com.l2jmobius.Config; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.ai.CtrlEvent; import com.l2jmobius.gameserver.ai.CtrlIntention; @@ -38,6 +37,7 @@ import com.l2jmobius.gameserver.datatables.ItemTable; import com.l2jmobius.gameserver.enums.ItemSkillType; import com.l2jmobius.gameserver.enums.NextActionType; import com.l2jmobius.gameserver.enums.StatusUpdateType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.Location; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java index bedc5a59ca..a2b9564f4f 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java @@ -22,10 +22,10 @@ import java.util.concurrent.ScheduledFuture; import java.util.logging.Level; import java.util.logging.Logger; -import com.l2jmobius.gameserver.GeoData; import com.l2jmobius.gameserver.ThreadPoolManager; import com.l2jmobius.gameserver.data.xml.impl.SkillData; import com.l2jmobius.gameserver.enums.ShotType; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.L2Object; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java index 07ed8f6037..58d967f84d 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCuboid.java @@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Rectangle; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java index 70910fd7e6..681f9a69de 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneCylinder.java @@ -17,7 +17,7 @@ package com.l2jmobius.gameserver.model.zone.form; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java index 56fd666598..6da33d788e 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/zone/form/ZoneNPoly.java @@ -19,7 +19,7 @@ package com.l2jmobius.gameserver.model.zone.form; import java.awt.Polygon; import com.l2jmobius.commons.util.Rnd; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.itemcontainer.Inventory; import com.l2jmobius.gameserver.model.zone.L2ZoneForm; diff --git a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/GeoUtils.java b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/GeoUtils.java index c706c4a491..21540f2215 100644 --- a/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/GeoUtils.java +++ b/L2J_Mobius_Underground/java/com/l2jmobius/gameserver/util/GeoUtils.java @@ -18,7 +18,7 @@ package com.l2jmobius.gameserver.util; import java.awt.Color; -import com.l2jmobius.gameserver.GeoData; +import com.l2jmobius.gameserver.geodata.GeoData; import com.l2jmobius.gameserver.geodata.geodriver.Cell; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.network.serverpackets.ExServerPrimitive;