diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java index f1693ec3bf..d21cd7ed1d 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/HandysBlockCheckerEvent.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.ExCubeGameTeamList; * Handys Block Checker Event AI. * @authors BiggBoss, Gigiikun */ -public class HandysBlockCheckerEvent extends Quest +final class HandysBlockCheckerEvent extends Quest { // Arena Managers private static final int A_MANAGER_1 = 32521; diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java index 11a7ebfcc5..df29fe4cfa 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/MC_Show.java @@ -38,7 +38,7 @@ import ai.npc.AbstractNpcAI; * MC Show AI. * @author Kerberos */ -public class MC_Show extends AbstractNpcAI +final class MC_Show extends AbstractNpcAI { private static int MC = 32433; // @formatter:off diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java index 05a4034f17..5294a1211b 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/Parade.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Fantasy Isle Parade * @author JOJO, Pandragon */ -public class Parade extends AbstractNpcAI +final class Parade extends AbstractNpcAI { // @formatter:off protected final int[] ACTORS = @@ -168,7 +168,7 @@ public class Parade extends AbstractNpcAI return (dd * 1000L) / 6L; } - protected class Start implements Runnable + class Start implements Runnable { @Override public void run() @@ -180,7 +180,7 @@ public class Parade extends AbstractNpcAI } } - protected class Spawn implements Runnable + class Spawn implements Runnable { @Override public void run() @@ -209,7 +209,7 @@ public class Parade extends AbstractNpcAI } } - protected class Delete implements Runnable + class Delete implements Runnable { @Override public void run() @@ -239,7 +239,7 @@ public class Parade extends AbstractNpcAI } } - protected class Clean implements Runnable + class Clean implements Runnable { @Override public void run() diff --git a/trunk/dist/game/data/scripts/ai/fantasy_isle/StartMCShow.java b/trunk/dist/game/data/scripts/ai/fantasy_isle/StartMCShow.java index 13cc6076a0..321d823add 100644 --- a/trunk/dist/game/data/scripts/ai/fantasy_isle/StartMCShow.java +++ b/trunk/dist/game/data/scripts/ai/fantasy_isle/StartMCShow.java @@ -21,7 +21,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager; /** * Start MC Show. */ -public class StartMCShow implements Runnable +class StartMCShow implements Runnable { @Override public void run() diff --git a/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java b/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java index 24a89e4867..a88b9fc93c 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java +++ b/trunk/dist/game/data/scripts/ai/group_template/AdenReconstructorManager.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Aden Reconstructor Manager AI. * @author St3eT */ -public final class AdenReconstructorManager extends AbstractNpcAI +final class AdenReconstructorManager extends AbstractNpcAI { // NPCs private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java b/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java index 4e423e58c3..1458e3e453 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java +++ b/trunk/dist/game/data/scripts/ai/group_template/ArcanRitual.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.serverpackets.OnEventTrigger; /** * @author Mobius */ -public class ArcanRitual extends Quest +final class ArcanRitual extends Quest { private static final int BLUE_TRIGGER = 262001; private static final int RED_TRIGGER = 262003; diff --git a/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java b/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java index e9cb184af3..8ef5dec904 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java +++ b/trunk/dist/game/data/scripts/ai/group_template/BeastFarm.java @@ -42,7 +42,7 @@ import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove; * Updated to Freya. * @author Fulminus, Gigiikun */ -public final class BeastFarm extends AbstractNpcAI +final class BeastFarm extends AbstractNpcAI { private static final int GOLDEN_SPICE = 15474; private static final int CRYSTAL_SPICE = 15475; diff --git a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java index 7baba31e8a..3f036edb5c 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java +++ b/trunk/dist/game/data/scripts/ai/group_template/DenOfEvil.java @@ -35,7 +35,7 @@ import ai.npc.AbstractNpcAI; * Dummy AI for spawns/respawns only for testing. * @author Gnacik */ -public final class DenOfEvil extends AbstractNpcAI +final class DenOfEvil extends AbstractNpcAI { // private static final int _buffer_id = 32656; protected static final int[] EYE_IDS = diff --git a/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java b/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java index b0a0ad7d99..2184d5e753 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java +++ b/trunk/dist/game/data/scripts/ai/group_template/DragonValley.java @@ -33,7 +33,7 @@ import ai.npc.AbstractNpcAI; * Dragon Valley AI. * @author St3eT */ -public final class DragonValley extends AbstractNpcAI +final class DragonValley extends AbstractNpcAI { // NPC private static final int NECROMANCER_OF_THE_VALLEY = 22858; @@ -85,6 +85,7 @@ public final class DragonValley extends AbstractNpcAI private static final int MIN_LVL = 80; private static final int CLASS_LVL = 3; private static final EnumMap CLASS_POINTS = new EnumMap<>(ClassId.class); + { CLASS_POINTS.put(ClassId.ADVENTURER, 0.2); CLASS_POINTS.put(ClassId.ARCANA_LORD, 1.5); diff --git a/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java b/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java index 1778b45a02..66308b73cc 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java +++ b/trunk/dist/game/data/scripts/ai/group_template/FairyTrees.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Fairy Trees AI. * @author Charus */ -public class FairyTrees extends AbstractNpcAI +final class FairyTrees extends AbstractNpcAI { // NPC private static final int SOUL_GUARDIAN = 27189; // Soul of Tree Guardian diff --git a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java index 8857b74e93..b3be0e9a91 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java +++ b/trunk/dist/game/data/scripts/ai/group_template/FeedableBeasts.java @@ -40,7 +40,7 @@ import quests.Q00655_AGrandPlanForTamingWildBeasts.Q00655_AGrandPlanForTamingWil * Growth-capable mobs: Polymorphing upon successful feeding. * @author Fulminus */ -public final class FeedableBeasts extends AbstractNpcAI +final class FeedableBeasts extends AbstractNpcAI { private static final int GOLDEN_SPICE = 6643; private static final int CRYSTAL_SPICE = 6644; diff --git a/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java b/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java index 5a74af36ba..e6d5f0bb32 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java +++ b/trunk/dist/game/data/scripts/ai/group_template/FleeMonsters.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Flee Monsters AI. * @author Pandragon, NosBit */ -public final class FleeMonsters extends AbstractNpcAI +final class FleeMonsters extends AbstractNpcAI { // NPCs private static final int[] MOBS = diff --git a/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java b/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java index 9623f70264..6057da1ab0 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java +++ b/trunk/dist/game/data/scripts/ai/group_template/FrozenLabyrinth.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Frozen Labyrinth AI. * @author malyelfik */ -public final class FrozenLabyrinth extends AbstractNpcAI +final class FrozenLabyrinth extends AbstractNpcAI { // Monsters private static final int PRONGHORN_SPIRIT = 22087; diff --git a/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java b/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java index 79d627b296..934a3521cf 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java +++ b/trunk/dist/game/data/scripts/ai/group_template/GiantsCave.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Giant's Cave AI. * @author Gnacik, St3eT */ -public final class GiantsCave extends AbstractNpcAI +final class GiantsCave extends AbstractNpcAI { // NPC private static final int[] SCOUTS = diff --git a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java index 30b93fbbb9..62075fbbc7 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java +++ b/trunk/dist/game/data/scripts/ai/group_template/HillsOfGold.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Hills of Gold AI. * @author Mobius */ -public class HillsOfGold extends AbstractNpcAI +final class HillsOfGold extends AbstractNpcAI { // Npcs private static final int GOLEM_OF_REPAIRS = 19309; diff --git a/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java b/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java index 74c0e7a31b..b51312eae0 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java +++ b/trunk/dist/game/data/scripts/ai/group_template/HotSprings.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Hot Springs AI. * @author Pandragon */ -public final class HotSprings extends AbstractNpcAI +final class HotSprings extends AbstractNpcAI { // NPCs private static final int BANDERSNATCHLING = 21314; diff --git a/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java b/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java index 1bac998744..12e0373091 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java +++ b/trunk/dist/game/data/scripts/ai/group_template/IsleOfPrayer.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Isle of Prayer AI. * @author Zoey76 */ -public final class IsleOfPrayer extends AbstractNpcAI +final class IsleOfPrayer extends AbstractNpcAI { // Items private static final int YELLOW_SEED_OF_EVIL_SHARD = 9593; diff --git a/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java b/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java index ed29412790..f788107566 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java +++ b/trunk/dist/game/data/scripts/ai/group_template/LairOfAntharas.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Lair of Antharas AI. * @author St3eT, UnAfraid */ -public final class LairOfAntharas extends AbstractNpcAI +final class LairOfAntharas extends AbstractNpcAI { // NPC final private static int KNORIKS = 22857; diff --git a/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java b/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java index fabff9ee0c..b772ba7fc9 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java +++ b/trunk/dist/game/data/scripts/ai/group_template/MinionSpawnManager.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Minion Spawn Manager. * @author Zealar */ -public final class MinionSpawnManager extends AbstractNpcAI +final class MinionSpawnManager extends AbstractNpcAI { private static final Set NPC = new HashSet<>(354); static diff --git a/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java b/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java index 615a3ddcd7..df6b7d5b3a 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java +++ b/trunk/dist/game/data/scripts/ai/group_template/MonasteryOfSilence.java @@ -34,7 +34,7 @@ import ai.npc.AbstractNpcAI; * Monastery of Silence AI. * @author Kerberos, nonom */ -public final class MonasteryOfSilence extends AbstractNpcAI +final class MonasteryOfSilence extends AbstractNpcAI { // NPCs private static final int CAPTAIN = 18910; // Solina Knight Captain diff --git a/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java b/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java index 65b328b545..346bff4038 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java +++ b/trunk/dist/game/data/scripts/ai/group_template/NonLethalableNpcs.java @@ -23,7 +23,7 @@ import ai.npc.AbstractNpcAI; /** * @author UnAfraid */ -public final class NonLethalableNpcs extends AbstractNpcAI +final class NonLethalableNpcs extends AbstractNpcAI { private static final int[] NPCS = { diff --git a/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java b/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java index 17fbfe36d4..87784b512e 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java +++ b/trunk/dist/game/data/scripts/ai/group_template/NonRandomWalkNpcs.java @@ -24,7 +24,7 @@ import ai.npc.AbstractNpcAI; * Non Random Walk Npcs AI. * @author Mobius */ -public class NonRandomWalkNpcs extends AbstractNpcAI +final class NonRandomWalkNpcs extends AbstractNpcAI { private static final int[] NPCS = { diff --git a/trunk/dist/game/data/scripts/ai/group_template/OrbisTempleStatues.java b/trunk/dist/game/data/scripts/ai/group_template/OrbisTempleStatues.java index 50bb229ba0..89b7980570 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/OrbisTempleStatues.java +++ b/trunk/dist/game/data/scripts/ai/group_template/OrbisTempleStatues.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Orbis Temple Statues AI. * @author Mobius */ -public class OrbisTempleStatues extends AbstractNpcAI +final class OrbisTempleStatues extends AbstractNpcAI { // Npcs private static final int VICTIM_1 = 22911; diff --git a/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java b/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java index 5fe1fef6c2..2a75094d29 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PaganKey.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Pagan Key AI. * @author Zoey76. Adapted to PaganKey by Notorionn */ -public final class PaganKey extends AbstractNpcAI +final class PaganKey extends AbstractNpcAI { // Items private static final int PAGAN_KEY = 8273; diff --git a/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java b/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java index 628321fb7b..ab9d5b9c7b 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PaganTemple.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Pagan Temple AI. * @author Mobius */ -public class PaganTemple extends AbstractNpcAI +final class PaganTemple extends AbstractNpcAI { // Npc private static final int TRIOL_HIGH_PRIEST = 19410; diff --git a/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java b/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java index 40e2c596ff..2a71c7f461 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PavelArchaic.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Pavel Archaic AI. * @author Gnacik, St3eT */ -public final class PavelArchaic extends AbstractNpcAI +final class PavelArchaic extends AbstractNpcAI { private static final int SAFETY_DEVICE = 18917; // Pavel Safety Device private static final int PINCER_GOLEM = 22801; // Cruel Pincer Golem diff --git a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java index 502a99a59f..ea159bb9a8 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfDion.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * AI for mobs in Plains of Dion (near Floran Village). * @author Gladicek */ -public final class PlainsOfDion extends AbstractNpcAI +final class PlainsOfDion extends AbstractNpcAI { private static final int DELU_LIZARDMEN[] = { diff --git a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java index e0f528e149..63efd5a7eb 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PlainsOfLizardman.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Plains of Lizardmen AI. * @author Gnacik, malyelfik */ -public final class PlainsOfLizardman extends AbstractNpcAI +final class PlainsOfLizardman extends AbstractNpcAI { // NPCs private static final int INVISIBLE_NPC = 18919; diff --git a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java index 6780eade14..c33abaf604 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingAngel.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; /** * Angel spawns...when one of the angels in the keys dies, the other angel will spawn. */ -public final class PolymorphingAngel extends AbstractNpcAI +final class PolymorphingAngel extends AbstractNpcAI { private static final Map ANGELSPAWNS = new HashMap<>(); static diff --git a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java index fb31445181..7f9c29157c 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PolymorphingOnAttack.java @@ -36,7 +36,7 @@ import ai.npc.AbstractNpcAI; * Polymorphing on attack monsters AI. * @author Slyce */ -public final class PolymorphingOnAttack extends AbstractNpcAI +final class PolymorphingOnAttack extends AbstractNpcAI { private static final Map> MOBSPAWNS = new HashMap<>(); static diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java index 7df9dc5458..fed4eb9d3b 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PrimevalIsle.java @@ -39,7 +39,7 @@ import ai.npc.AbstractNpcAI; * Primeval Isle AI. * @author St3eT */ -public final class PrimevalIsle extends AbstractNpcAI +final class PrimevalIsle extends AbstractNpcAI { // NPC private static final int EGG = 18344; // Ancient Egg diff --git a/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java b/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java index 22126ff9d7..2364b479e6 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java +++ b/trunk/dist/game/data/scripts/ai/group_template/PrisonGuards.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Prison Guards AI. * @author St3eT */ -public final class PrisonGuards extends AbstractNpcAI +final class PrisonGuards extends AbstractNpcAI { // NPCs private static final int GUARD_HEAD = 18367; // Prison Guard diff --git a/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java b/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java index 5acc8a3aea..8236d2dfbc 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java +++ b/trunk/dist/game/data/scripts/ai/group_template/RandomSpawn.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Manages spawn of NPCs having several random spawn points. * @author GKR */ -public final class RandomSpawn extends AbstractNpcAI +final class RandomSpawn extends AbstractNpcAI { private static final Map SPAWN_POINTS = new HashMap<>(); static diff --git a/trunk/dist/game/data/scripts/ai/group_template/Remnants.java b/trunk/dist/game/data/scripts/ai/group_template/Remnants.java index 23bbb64da2..23065ccef2 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/Remnants.java +++ b/trunk/dist/game/data/scripts/ai/group_template/Remnants.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Remnants AI. * @author DS */ -public final class Remnants extends AbstractNpcAI +final class Remnants extends AbstractNpcAI { private static final int[] NPCS = { diff --git a/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java b/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java index 377115010c..fcbbbcd8ba 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java +++ b/trunk/dist/game/data/scripts/ai/group_template/Sandstorms.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Sandstorms AI. * @author Ectis */ -public class Sandstorms extends AbstractNpcAI +final class Sandstorms extends AbstractNpcAI { // NPCs private static final int SANDSTORM = 32350; diff --git a/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java b/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java index 2051284364..eebdc0958d 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SeeThroughSilentMove.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * See Through Silent Move AI. * @author Gigiikun */ -public class SeeThroughSilentMove extends AbstractNpcAI +final class SeeThroughSilentMove extends AbstractNpcAI { //@formatter:off private static final int[] MONSTERS = diff --git a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java index fe310129ab..b82cc89700 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SelMahumDrill.java @@ -36,7 +36,7 @@ import ai.npc.AbstractNpcAI; * Sel Mahum Training Ground AI for drill groups. * @author GKR */ -public final class SelMahumDrill extends AbstractNpcAI +final class SelMahumDrill extends AbstractNpcAI { private static final int[] MAHUM_CHIEFS = { diff --git a/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java b/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java index 7853dd7155..7458d0146c 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SelMahumSquad.java @@ -35,7 +35,7 @@ import ai.npc.AbstractNpcAI; * Sel Mahum Training Ground AI for squads and chefs. * @author GKR */ -public final class SelMahumSquad extends AbstractNpcAI +final class SelMahumSquad extends AbstractNpcAI { // NPC's private static final int CHEF = 18908; diff --git a/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java b/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java index 246c60bbad..314df42315 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SilentValley.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Silent Valley AI * @author malyelfik */ -public final class SilentValley extends AbstractNpcAI +final class SilentValley extends AbstractNpcAI { // Skills private static final SkillHolder BETRAYAL = new SkillHolder(6033, 1); // Treasure Seeker's Betrayal diff --git a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java index ec89a515a3..54189040de 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java +++ b/trunk/dist/game/data/scripts/ai/group_template/StakatoNest.java @@ -34,7 +34,7 @@ import ai.npc.AbstractNpcAI; * Stakato Nest AI. * @author Gnacik */ -public final class StakatoNest extends AbstractNpcAI +final class StakatoNest extends AbstractNpcAI { // @formatter:off // List of all mobs just for register diff --git a/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java b/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java index 8a2f8fcf50..3617d922a2 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java +++ b/trunk/dist/game/data/scripts/ai/group_template/SummonPc.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Summon the player to the NPC on attack. * @author Zoey76 */ -public final class SummonPc extends AbstractNpcAI +final class SummonPc extends AbstractNpcAI { // NPCs private static final int PORTA = 20213; diff --git a/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java b/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java index 82b80561cd..85e69fc231 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java +++ b/trunk/dist/game/data/scripts/ai/group_template/TurekOrcs.java @@ -34,7 +34,7 @@ import ai.npc.AbstractNpcAI; * Turek Orcs AI - flee and return with assistance * @author GKR */ -public final class TurekOrcs extends AbstractNpcAI +final class TurekOrcs extends AbstractNpcAI { // Monster to spawn private static final int CHERTUBA_ILLUSION = 23422; diff --git a/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java b/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java index 6593763701..01e09dce93 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java +++ b/trunk/dist/game/data/scripts/ai/group_template/WarriorFishingBlock.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * Warrior Fishing Block AI. * @author Zoey76 */ -public final class WarriorFishingBlock extends AbstractNpcAI +final class WarriorFishingBlock extends AbstractNpcAI { // Monsters private static final int[] MONSTERS = diff --git a/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java b/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java index 06bbe97d39..5e1ada2861 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java +++ b/trunk/dist/game/data/scripts/ai/group_template/Wasteland.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Wasteland AI. * @author Stayway, Mobius */ -public class Wasteland extends AbstractNpcAI +final class Wasteland extends AbstractNpcAI { // NPCs private static final int JOEL = 33516; diff --git a/trunk/dist/game/data/scripts/ai/group_template/YeSagira.java b/trunk/dist/game/data/scripts/ai/group_template/YeSagira.java index 9134d238bd..47c2aac138 100644 --- a/trunk/dist/game/data/scripts/ai/group_template/YeSagira.java +++ b/trunk/dist/game/data/scripts/ai/group_template/YeSagira.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * YeSagira AI. * @author Stayway, Mobius */ -public class YeSagira extends AbstractNpcAI +final class YeSagira extends AbstractNpcAI { // Npcs private static final int GUARD_1 = 19152; diff --git a/trunk/dist/game/data/scripts/ai/individual/Anais.java b/trunk/dist/game/data/scripts/ai/individual/Anais.java index b70b02519a..18a34efc23 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Anais.java +++ b/trunk/dist/game/data/scripts/ai/individual/Anais.java @@ -33,7 +33,7 @@ import ai.npc.AbstractNpcAI; * Anais AI. * @author nonom */ -public final class Anais extends AbstractNpcAI +final class Anais extends AbstractNpcAI { // NPCs private static final int ANAIS = 25701; @@ -165,10 +165,6 @@ public final class Anais extends AbstractNpcAI return super.onAttack(npc, attacker, damage, isSummon); } - /* - * (non-Javadoc) - * @see com.l2jmobius.gameserver.model.quest.Quest#onSpawn(com.l2jmobius.gameserver.model.actor.L2Npc) - */ @Override public String onSpawn(L2Npc npc) { diff --git a/trunk/dist/game/data/scripts/ai/individual/Ballista.java b/trunk/dist/game/data/scripts/ai/individual/Ballista.java index 8e4ac8a447..b704c9f1f7 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Ballista.java +++ b/trunk/dist/game/data/scripts/ai/individual/Ballista.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * Ballista AI. * @author St3eT */ -public final class Ballista extends AbstractNpcAI +final class Ballista extends AbstractNpcAI { // NPCs private static final int[] BALLISTA = diff --git a/trunk/dist/game/data/scripts/ai/individual/Banette.java b/trunk/dist/game/data/scripts/ai/individual/Banette.java index d6af27f542..4b2000a0b8 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Banette.java +++ b/trunk/dist/game/data/scripts/ai/individual/Banette.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Banette AI. * @author Gladicek */ -public final class Banette extends AbstractNpcAI +final class Banette extends AbstractNpcAI { // NPCs private static final int BANETTE = 33114; diff --git a/trunk/dist/game/data/scripts/ai/individual/Beleth.java b/trunk/dist/game/data/scripts/ai/individual/Beleth.java index 9e76b11c7d..b14e3ce7b1 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Beleth.java +++ b/trunk/dist/game/data/scripts/ai/individual/Beleth.java @@ -54,7 +54,7 @@ import ai.npc.AbstractNpcAI; * Beleth's AI. * @author Treat, Sahar */ -public final class Beleth extends AbstractNpcAI +final class Beleth extends AbstractNpcAI { // Status private static final int ALIVE = 0; diff --git a/trunk/dist/game/data/scripts/ai/individual/Bink.java b/trunk/dist/game/data/scripts/ai/individual/Bink.java index d8d55029d5..2e79cadfd9 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Bink.java +++ b/trunk/dist/game/data/scripts/ai/individual/Bink.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Bink AI. * @author Gladicek */ -public final class Bink extends AbstractNpcAI +final class Bink extends AbstractNpcAI { // NPCs private static final int BINK = 33223; diff --git a/trunk/dist/game/data/scripts/ai/individual/Core.java b/trunk/dist/game/data/scripts/ai/individual/Core.java index 8cc95099bd..dd508c4d46 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Core.java +++ b/trunk/dist/game/data/scripts/ai/individual/Core.java @@ -37,7 +37,7 @@ import ai.npc.AbstractNpcAI; * Core AI. * @author DrLecter, Emperorc */ -public final class Core extends AbstractNpcAI +final class Core extends AbstractNpcAI { private static final int CORE = 29006; private static final int DEATH_KNIGHT = 29007; diff --git a/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java b/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java index 8c985da78f..42707fa93c 100644 --- a/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java +++ b/trunk/dist/game/data/scripts/ai/individual/CrimsonHatuOtis.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * AI for Kamaloka (33) - Crimson Hatu Otis * @author Gladicek */ -public final class CrimsonHatuOtis extends AbstractNpcAI +final class CrimsonHatuOtis extends AbstractNpcAI { // Npc private static final int CRIMSON_HATU_OTIS = 18558; diff --git a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java index 07fd8adf63..9e30258db7 100644 --- a/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java +++ b/trunk/dist/game/data/scripts/ai/individual/DarkWaterDragon.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; /** * Dark Water Dragon's AI. */ -public final class DarkWaterDragon extends AbstractNpcAI +final class DarkWaterDragon extends AbstractNpcAI { private static final int DRAGON = 22267; private static final int SHADE1 = 22268; diff --git a/trunk/dist/game/data/scripts/ai/individual/Devno.java b/trunk/dist/game/data/scripts/ai/individual/Devno.java index 13bfc3c1a1..6dad0ad446 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Devno.java +++ b/trunk/dist/game/data/scripts/ai/individual/Devno.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Devno AI. * @author Gladicek */ -public final class Devno extends AbstractNpcAI +final class Devno extends AbstractNpcAI { // NPC private static final int DEVNO = 33241; diff --git a/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java b/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java index 70a93ec076..cc29404880 100644 --- a/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java +++ b/trunk/dist/game/data/scripts/ai/individual/DivineBeast.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Simple AI that manages special conditions for Divine Beast summon. * @author UnAfraid */ -public final class DivineBeast extends AbstractNpcAI +final class DivineBeast extends AbstractNpcAI { private static final int DIVINE_BEAST = 14870; private static final int TRANSFORMATION_ID = 258; diff --git a/trunk/dist/game/data/scripts/ai/individual/DrillSergeant.java b/trunk/dist/game/data/scripts/ai/individual/DrillSergeant.java index 16ae21dec7..ad6be3dcf4 100644 --- a/trunk/dist/game/data/scripts/ai/individual/DrillSergeant.java +++ b/trunk/dist/game/data/scripts/ai/individual/DrillSergeant.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Drill Sergeant AI. * @author St3eT */ -public final class DrillSergeant extends AbstractNpcAI +final class DrillSergeant extends AbstractNpcAI { // NPCs private static final int SERGANT = 33007; // Drill Sergant diff --git a/trunk/dist/game/data/scripts/ai/individual/Eleve.java b/trunk/dist/game/data/scripts/ai/individual/Eleve.java index 8808ab6bed..d5404f940d 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Eleve.java +++ b/trunk/dist/game/data/scripts/ai/individual/Eleve.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Eleve AI. * @author Gladicek */ -public final class Eleve extends AbstractNpcAI +final class Eleve extends AbstractNpcAI { // NPC private static final int ELEVE = 33246; diff --git a/trunk/dist/game/data/scripts/ai/individual/Epidos.java b/trunk/dist/game/data/scripts/ai/individual/Epidos.java index 94f95598d2..8c768d85ba 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Epidos.java +++ b/trunk/dist/game/data/scripts/ai/individual/Epidos.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Manages minion's spawn, idle despawn and Teleportation Cube spawn. * @author GKR */ -public final class Epidos extends AbstractNpcAI +final class Epidos extends AbstractNpcAI { private static final int[] EPIDOSES = { diff --git a/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java b/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java index 609ff3f813..82dc61c632 100644 --- a/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java +++ b/trunk/dist/game/data/scripts/ai/individual/EvasGiftBox.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Eva's Gift Box AI. * @author St3eT */ -public final class EvasGiftBox extends AbstractNpcAI +final class EvasGiftBox extends AbstractNpcAI { // NPC private static final int BOX = 32342; // Eva's Gift Box diff --git a/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java b/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java index f066a9d1bc..9a4486c15f 100644 --- a/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java +++ b/trunk/dist/game/data/scripts/ai/individual/FrightenedRagnaOrc.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Frightened Ragna Orc AI. * @author Gladicek, malyelfik */ -public final class FrightenedRagnaOrc extends AbstractNpcAI +final class FrightenedRagnaOrc extends AbstractNpcAI { // NPC ID private static final int MOB_ID = 18807; diff --git a/trunk/dist/game/data/scripts/ai/individual/Gagabu.java b/trunk/dist/game/data/scripts/ai/individual/Gagabu.java index 5065361e85..45be46285f 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Gagabu.java +++ b/trunk/dist/game/data/scripts/ai/individual/Gagabu.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Gagabu AI. * @author Gladicek */ -public final class Gagabu extends AbstractNpcAI +final class Gagabu extends AbstractNpcAI { // NPCs private static final int GAGABU = 33284; diff --git a/trunk/dist/game/data/scripts/ai/individual/Galad.java b/trunk/dist/game/data/scripts/ai/individual/Galad.java index 63bbd3850f..d3e59f1225 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Galad.java +++ b/trunk/dist/game/data/scripts/ai/individual/Galad.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Galad AI. * @author Gladicek */ -public final class Galad extends AbstractNpcAI +final class Galad extends AbstractNpcAI { // NPCs private static final int GALAD = 33572; diff --git a/trunk/dist/game/data/scripts/ai/individual/Gordon.java b/trunk/dist/game/data/scripts/ai/individual/Gordon.java index 53b8d4f212..23b0af0f94 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Gordon.java +++ b/trunk/dist/game/data/scripts/ai/individual/Gordon.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Gordon AI * @author TOFIZ, malyelfik */ -public final class Gordon extends AbstractNpcAI +final class Gordon extends AbstractNpcAI { private static final int GORDON = 29095; diff --git a/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java b/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java index 88a9e75cc2..44057120b6 100644 --- a/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java +++ b/trunk/dist/game/data/scripts/ai/individual/GraveRobbers.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * * @author Zealar */ -public final class GraveRobbers extends AbstractNpcAI +final class GraveRobbers extends AbstractNpcAI { private static final int GRAVE_ROBBER_SUMMONER = 22678; private static final int GRAVE_ROBBER_MEGICIAN = 22679; diff --git a/trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java b/trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java index af70451587..cc0a1872da 100644 --- a/trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java +++ b/trunk/dist/game/data/scripts/ai/individual/GuardSoldier.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Guard Soldier AI. * @author Gladicek */ -public final class GuardSoldier extends AbstractNpcAI +final class GuardSoldier extends AbstractNpcAI { // NPCs private static final int GUARD_SOLDIER = 33286; diff --git a/trunk/dist/game/data/scripts/ai/individual/Handermonkey.java b/trunk/dist/game/data/scripts/ai/individual/Handermonkey.java index abb258d746..7a310ee6d1 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Handermonkey.java +++ b/trunk/dist/game/data/scripts/ai/individual/Handermonkey.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Handermonkey AI. * @author Gladicek */ -public final class Handermonkey extends AbstractNpcAI +final class Handermonkey extends AbstractNpcAI { // NPC private static final int HANDERMONKEY = 33203; diff --git a/trunk/dist/game/data/scripts/ai/individual/Heymond.java b/trunk/dist/game/data/scripts/ai/individual/Heymond.java index 8bd16ea4fd..92512aa894 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Heymond.java +++ b/trunk/dist/game/data/scripts/ai/individual/Heymond.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Heymond AI. * @author Gladicek */ -public final class Heymond extends AbstractNpcAI +final class Heymond extends AbstractNpcAI { // NPCs private static final int HEYMOND = 33026; diff --git a/trunk/dist/game/data/scripts/ai/individual/Holly.java b/trunk/dist/game/data/scripts/ai/individual/Holly.java index dca721d2b2..897d5c6714 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Holly.java +++ b/trunk/dist/game/data/scripts/ai/individual/Holly.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Holly AI. * @author Gladicek */ -public final class Holly extends AbstractNpcAI +final class Holly extends AbstractNpcAI { // NPCs private static final int HOLLY = 33219; diff --git a/trunk/dist/game/data/scripts/ai/individual/Karonf.java b/trunk/dist/game/data/scripts/ai/individual/Karonf.java index 7fe77ef168..7ae5ffce74 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Karonf.java +++ b/trunk/dist/game/data/scripts/ai/individual/Karonf.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Karonf AI. * @author Gladicek */ -public final class Karonf extends AbstractNpcAI +final class Karonf extends AbstractNpcAI { // NPC private static final int KARONF = 33242; diff --git a/trunk/dist/game/data/scripts/ai/individual/Lailly.java b/trunk/dist/game/data/scripts/ai/individual/Lailly.java index e171ce31c0..3a67acc4e6 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Lailly.java +++ b/trunk/dist/game/data/scripts/ai/individual/Lailly.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Lailly AI. * @author Stayway */ -public final class Lailly extends AbstractNpcAI +final class Lailly extends AbstractNpcAI { // NPCs private static final int LAILLY = 34181; diff --git a/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java b/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java index f021bbc653..89c289f4fc 100644 --- a/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java +++ b/trunk/dist/game/data/scripts/ai/individual/LeopardDragonHachling.java @@ -36,13 +36,14 @@ import ai.npc.AbstractNpcAI; * Leopard Dragon Hachling AI. * @author Mobius */ -public class LeopardDragonHachling extends AbstractNpcAI +final class LeopardDragonHachling extends AbstractNpcAI { // NPCs private static final int DRAGON_HACHLING = 23434; private static final int LEOPARD_DRAGON = 23435; // Locations private static final List TRANSFORM_LOCATIONS = new ArrayList<>(); + { TRANSFORM_LOCATIONS.add(new Location(84199, 120022, -2944)); TRANSFORM_LOCATIONS.add(new Location(92138, 113735, -3076)); diff --git a/trunk/dist/game/data/scripts/ai/individual/Luderic.java b/trunk/dist/game/data/scripts/ai/individual/Luderic.java index dcfc2d753b..f65a1012fd 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Luderic.java +++ b/trunk/dist/game/data/scripts/ai/individual/Luderic.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Luderic AI. * @author Gladicek */ -public final class Luderic extends AbstractNpcAI +final class Luderic extends AbstractNpcAI { // NPCs private static final int LUDERIC = 33575; diff --git a/trunk/dist/game/data/scripts/ai/individual/Lumi.java b/trunk/dist/game/data/scripts/ai/individual/Lumi.java index 6d3cb907f9..e018dcdbee 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Lumi.java +++ b/trunk/dist/game/data/scripts/ai/individual/Lumi.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Lumi AI. * @author Gladicek */ -public final class Lumi extends AbstractNpcAI +final class Lumi extends AbstractNpcAI { // NPCs private static final int LUMI = 33025; diff --git a/trunk/dist/game/data/scripts/ai/individual/Mahram.java b/trunk/dist/game/data/scripts/ai/individual/Mahram.java index 7732b821a8..e6db1ec608 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Mahram.java +++ b/trunk/dist/game/data/scripts/ai/individual/Mahram.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Mahram AI. * @author St3eT */ -public final class Mahram extends AbstractNpcAI +final class Mahram extends AbstractNpcAI { // NPCs private static final int MAHRAM = 33271; diff --git a/trunk/dist/game/data/scripts/ai/individual/Mai.java b/trunk/dist/game/data/scripts/ai/individual/Mai.java index 5996d0c3ac..8142ed25f5 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Mai.java +++ b/trunk/dist/game/data/scripts/ai/individual/Mai.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Mai AI. * @author Gladicek */ -public final class Mai extends AbstractNpcAI +final class Mai extends AbstractNpcAI { // NPCs private static final int MAI = 33238; diff --git a/trunk/dist/game/data/scripts/ai/individual/MarinSmith.java b/trunk/dist/game/data/scripts/ai/individual/MarinSmith.java index 67686d513a..d78513ff56 100644 --- a/trunk/dist/game/data/scripts/ai/individual/MarinSmith.java +++ b/trunk/dist/game/data/scripts/ai/individual/MarinSmith.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Marin Smith AI. * @author Gladicek */ -public final class MarinSmith extends AbstractNpcAI +final class MarinSmith extends AbstractNpcAI { // NPCs private static final int MARIN_SMITH = 33285; diff --git a/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java index 6752008d08..4e79d131b3 100644 --- a/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java +++ b/trunk/dist/game/data/scripts/ai/individual/MercenaryCaptain.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Mercenary Captain AI. * @author Mobius */ -public final class MercenaryCaptain extends AbstractNpcAI +final class MercenaryCaptain extends AbstractNpcAI { // NPC private static final int MERCENARY_CAPTAIN = 33970; diff --git a/trunk/dist/game/data/scripts/ai/individual/Namo.java b/trunk/dist/game/data/scripts/ai/individual/Namo.java index 580bba5947..4a5358f972 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Namo.java +++ b/trunk/dist/game/data/scripts/ai/individual/Namo.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Namo AI * @author Mobius */ -public final class Namo extends AbstractNpcAI +final class Namo extends AbstractNpcAI { // NPC private static final int NAMO = 33973; diff --git a/trunk/dist/game/data/scripts/ai/individual/Orfen.java b/trunk/dist/game/data/scripts/ai/individual/Orfen.java index 59f36750f3..87895db6a6 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Orfen.java +++ b/trunk/dist/game/data/scripts/ai/individual/Orfen.java @@ -45,7 +45,7 @@ import ai.npc.AbstractNpcAI; * Orfen's AI * @author Emperorc */ -public final class Orfen extends AbstractNpcAI +final class Orfen extends AbstractNpcAI { private static final Location[] POS = { diff --git a/trunk/dist/game/data/scripts/ai/individual/Oris.java b/trunk/dist/game/data/scripts/ai/individual/Oris.java index 45ef1ada6f..2c9fa4a9cc 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Oris.java +++ b/trunk/dist/game/data/scripts/ai/individual/Oris.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Oris AI. * @author Gladicek */ -public final class Oris extends AbstractNpcAI +final class Oris extends AbstractNpcAI { // NPCs private static final int ORIS = 33116; diff --git a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java index 999e043932..2b5212a20a 100644 --- a/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java +++ b/trunk/dist/game/data/scripts/ai/individual/QueenAnt.java @@ -45,7 +45,7 @@ import ai.npc.AbstractNpcAI; * Queen Ant's AI * @author Emperorc */ -public final class QueenAnt extends AbstractNpcAI +final class QueenAnt extends AbstractNpcAI { private static final int QUEEN = 29001; private static final int LARVA = 29002; diff --git a/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java b/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java index 6633839b49..6e1c7ee46f 100644 --- a/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java +++ b/trunk/dist/game/data/scripts/ai/individual/QueenShyeed.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * Queen Shyeed AI * @author malyelfik */ -public final class QueenShyeed extends AbstractNpcAI +final class QueenShyeed extends AbstractNpcAI { // NPC private static final int SHYEED = 25671; diff --git a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java index fceb577d8e..1256d4bb1c 100644 --- a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java +++ b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcCommander.java @@ -24,7 +24,7 @@ import ai.npc.AbstractNpcAI; * Ragna Orc Commander AI. * @author Zealar */ -public final class RagnaOrcCommander extends AbstractNpcAI +final class RagnaOrcCommander extends AbstractNpcAI { private static final int RAGNA_ORC_COMMANDER = 22694; diff --git a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java index 8877867714..f18e7d9235 100644 --- a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java +++ b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcHero.java @@ -24,7 +24,7 @@ import ai.npc.AbstractNpcAI; * Ragna Orc Hero AI. * @author Zealar */ -public final class RagnaOrcHero extends AbstractNpcAI +final class RagnaOrcHero extends AbstractNpcAI { private static final int RAGNA_ORC_HERO = 22693; diff --git a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java index 6a36b601e1..86b9f437dc 100644 --- a/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java +++ b/trunk/dist/game/data/scripts/ai/individual/RagnaOrcSeer.java @@ -24,7 +24,7 @@ import ai.npc.AbstractNpcAI; * Ragna Orc Seer AI. * @author Zealar */ -public final class RagnaOrcSeer extends AbstractNpcAI +final class RagnaOrcSeer extends AbstractNpcAI { private static final int RAGNA_ORC_SEER = 22697; diff --git a/trunk/dist/game/data/scripts/ai/individual/Rakun.java b/trunk/dist/game/data/scripts/ai/individual/Rakun.java index 5062dcdf5f..dddd0ce3e0 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Rakun.java +++ b/trunk/dist/game/data/scripts/ai/individual/Rakun.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Rakun AI. * @author Mobius */ -public final class Rakun extends AbstractNpcAI +final class Rakun extends AbstractNpcAI { // NPC private static final int RAKUN = 33972; diff --git a/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java b/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java index 5a5d19ece0..046c98ae90 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java +++ b/trunk/dist/game/data/scripts/ai/individual/Sailren/Sailren.java @@ -33,7 +33,7 @@ import ai.npc.AbstractNpcAI; * Sailren AI. * @author St3eT */ -public final class Sailren extends AbstractNpcAI +final class Sailren extends AbstractNpcAI { // NPCs private static final int STATUE = 32109; // Shilen's Stone Statue diff --git a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java index d7d5c3b4ef..1dcba5a52b 100644 --- a/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java +++ b/trunk/dist/game/data/scripts/ai/individual/ScarletVanHalisha.java @@ -39,7 +39,7 @@ import ai.npc.AbstractNpcAI; /** * @author Micr0, Zerox */ -public class ScarletVanHalisha extends AbstractNpcAI +final class ScarletVanHalisha extends AbstractNpcAI { private L2Character _target; private Skill _skill; diff --git a/trunk/dist/game/data/scripts/ai/individual/Shannon.java b/trunk/dist/game/data/scripts/ai/individual/Shannon.java index c6ffc7d907..77a2af48ae 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Shannon.java +++ b/trunk/dist/game/data/scripts/ai/individual/Shannon.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Shannon AI. * @author St3eT */ -public final class Shannon extends AbstractNpcAI +final class Shannon extends AbstractNpcAI { // NPCs private static final int SHANNON = 32974; diff --git a/trunk/dist/game/data/scripts/ai/individual/SinEater.java b/trunk/dist/game/data/scripts/ai/individual/SinEater.java index e4f2996861..5e5a46b282 100644 --- a/trunk/dist/game/data/scripts/ai/individual/SinEater.java +++ b/trunk/dist/game/data/scripts/ai/individual/SinEater.java @@ -36,7 +36,7 @@ import ai.npc.AbstractNpcAI; * Sin Eater AI. * @author St3eT. */ -public final class SinEater extends AbstractNpcAI +final class SinEater extends AbstractNpcAI { // NPCs private static final int SIN_EATER = 12564; diff --git a/trunk/dist/game/data/scripts/ai/individual/SinWardens.java b/trunk/dist/game/data/scripts/ai/individual/SinWardens.java index 6768a61ec3..ed33655504 100644 --- a/trunk/dist/game/data/scripts/ai/individual/SinWardens.java +++ b/trunk/dist/game/data/scripts/ai/individual/SinWardens.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Manages Sin Wardens disappearing and chat. * @author GKR */ -public final class SinWardens extends AbstractNpcAI +final class SinWardens extends AbstractNpcAI { private static final int[] SIN_WARDEN_MINIONS = { diff --git a/trunk/dist/game/data/scripts/ai/individual/Sodian.java b/trunk/dist/game/data/scripts/ai/individual/Sodian.java index b1f9ec44e5..add6d4067d 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Sodian.java +++ b/trunk/dist/game/data/scripts/ai/individual/Sodian.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Sodian AI. * @author Gladicek */ -public final class Sodian extends AbstractNpcAI +final class Sodian extends AbstractNpcAI { // NPCs private static final int SODIAN = 33229; diff --git a/trunk/dist/game/data/scripts/ai/individual/Stiller.java b/trunk/dist/game/data/scripts/ai/individual/Stiller.java index 671e413901..55d851812b 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Stiller.java +++ b/trunk/dist/game/data/scripts/ai/individual/Stiller.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Stiller AI. * @author Gladicek */ -public final class Stiller extends AbstractNpcAI +final class Stiller extends AbstractNpcAI { // NPCs private static final int STILLER = 33125; diff --git a/trunk/dist/game/data/scripts/ai/individual/Theodore.java b/trunk/dist/game/data/scripts/ai/individual/Theodore.java index d3b8314956..ae07e42091 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Theodore.java +++ b/trunk/dist/game/data/scripts/ai/individual/Theodore.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Theodore AI. * @author Gladicek */ -public final class Theodore extends AbstractNpcAI +final class Theodore extends AbstractNpcAI { // NPC private static final int THEODORE = 32975; diff --git a/trunk/dist/game/data/scripts/ai/individual/TomaJunior.java b/trunk/dist/game/data/scripts/ai/individual/TomaJunior.java index 5aaa4a1ef2..7150e34bb9 100644 --- a/trunk/dist/game/data/scripts/ai/individual/TomaJunior.java +++ b/trunk/dist/game/data/scripts/ai/individual/TomaJunior.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Guard Soldier AI. * @author Gladicek */ -public final class TomaJunior extends AbstractNpcAI +final class TomaJunior extends AbstractNpcAI { // NPCs private static final int TOMA_JUNIOR = 33571; diff --git a/trunk/dist/game/data/scripts/ai/individual/TrainingGolem.java b/trunk/dist/game/data/scripts/ai/individual/TrainingGolem.java index eacddb5623..33647f6b8c 100644 --- a/trunk/dist/game/data/scripts/ai/individual/TrainingGolem.java +++ b/trunk/dist/game/data/scripts/ai/individual/TrainingGolem.java @@ -24,7 +24,7 @@ import ai.npc.AbstractNpcAI; * Training Golem AI. * @author Gladicek */ -public final class TrainingGolem extends AbstractNpcAI +final class TrainingGolem extends AbstractNpcAI { // NPCs private static final int TRAINING_GOLEM = 27532; diff --git a/trunk/dist/game/data/scripts/ai/individual/TrainningSoldier.java b/trunk/dist/game/data/scripts/ai/individual/TrainningSoldier.java index 90f9d8b79b..698b7913c3 100644 --- a/trunk/dist/game/data/scripts/ai/individual/TrainningSoldier.java +++ b/trunk/dist/game/data/scripts/ai/individual/TrainningSoldier.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Trainning Soldier AI. * @author St3eT */ -public final class TrainningSoldier extends AbstractNpcAI +final class TrainningSoldier extends AbstractNpcAI { // NPCs private static final int SOLDIER = 33201; // Trainning Soldier diff --git a/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java b/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java index 5755891ca8..62a790a110 100644 --- a/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java +++ b/trunk/dist/game/data/scripts/ai/individual/Venom/Venom.java @@ -41,7 +41,7 @@ import ai.npc.AbstractNpcAI; * Venom AI on Rune Castle. * @author nonom, MELERIX */ -public final class Venom extends AbstractNpcAI +final class Venom extends AbstractNpcAI { private static final int CASTLE = 8; // Rune diff --git a/trunk/dist/game/data/scripts/ai/individual/WindVortex.java b/trunk/dist/game/data/scripts/ai/individual/WindVortex.java index 0089fe7343..6833f83a56 100644 --- a/trunk/dist/game/data/scripts/ai/individual/WindVortex.java +++ b/trunk/dist/game/data/scripts/ai/individual/WindVortex.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; /** * @author Stayway */ -public final class WindVortex extends AbstractNpcAI +final class WindVortex extends AbstractNpcAI { // NPCs private static final int WIND_VORTEX = 23417; diff --git a/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java b/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java index ed5e64921d..9f216001fe 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java +++ b/trunk/dist/game/data/scripts/ai/npc/Acateo/Acateo.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Acateo AI. * @author Gladicek */ -public final class Acateo extends AbstractNpcAI +final class Acateo extends AbstractNpcAI { // NPC private static final int ACATEO = 33905; diff --git a/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java b/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java index 8011e53d82..764fd6428b 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java +++ b/trunk/dist/game/data/scripts/ai/npc/AdventurersGuide/AdventurersGuide.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Adventurers Guide AI. * @author St3eT, Updated by Stayway, Mobius */ -public final class AdventurersGuide extends AbstractNpcAI +final class AdventurersGuide extends AbstractNpcAI { // NPCs private static final int[] ADVENTURER_GUIDES = diff --git a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java index d315e494c7..efedfd48a5 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java +++ b/trunk/dist/game/data/scripts/ai/npc/Alarm/Alarm.java @@ -31,7 +31,7 @@ import quests.Q00185_NikolasCooperation.Q00185_NikolasCooperation; * Alarm AI for quests Art of Persuasion (184) and Nikola's Cooperation (185). * @author Zoey76 */ -public final class Alarm extends AbstractNpcAI +final class Alarm extends AbstractNpcAI { // NPC private static final int ALARM = 32367; diff --git a/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java b/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java index 1b891cb487..9d1e680e7b 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/AlchemistManager/AlchemistManager.java @@ -34,7 +34,7 @@ import ai.npc.AbstractNpcAI; * Alchemist Manager AI. * @author Sdw */ -public final class AlchemistManager extends AbstractNpcAI +final class AlchemistManager extends AbstractNpcAI { // NPCs private static final int ALCHEMISTS[] = diff --git a/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java b/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java index 4757c8651f..7f88626f63 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java +++ b/trunk/dist/game/data/scripts/ai/npc/Alexandria/Alexandria.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Alexandria (Armor Merchant) AI. * @author xban1x */ -public final class Alexandria extends AbstractNpcAI +final class Alexandria extends AbstractNpcAI { // NPC private static final int ALEXANDRIA = 30098; @@ -122,11 +122,11 @@ public final class Alexandria extends AbstractNpcAI return htmltext; } - public static class AdditionalQuestItemHolder extends QuestItemHolder + private static class AdditionalQuestItemHolder extends QuestItemHolder { private final int _additionalId; - public AdditionalQuestItemHolder(int id, int chance, long count, int additionalId) + AdditionalQuestItemHolder(int id, int chance, long count, int additionalId) { super(id, chance, count); _additionalId = additionalId; diff --git a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java b/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java index 3e5b7f04f0..be4ab3826c 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java +++ b/trunk/dist/game/data/scripts/ai/npc/AltarOfSouls/AltarOfSouls.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Altar of Souls AI. * @author Mobius */ -public final class AltarOfSouls extends AbstractNpcAI +final class AltarOfSouls extends AbstractNpcAI { // NPCs private static final int ALTAR_OF_SOULS = 33920; diff --git a/trunk/dist/game/data/scripts/ai/npc/Apprentice/Apprentice.java b/trunk/dist/game/data/scripts/ai/npc/Apprentice/Apprentice.java index 65f069cdcc..09c26c41f1 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Apprentice/Apprentice.java +++ b/trunk/dist/game/data/scripts/ai/npc/Apprentice/Apprentice.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Apprentice AI. * @author St3eT */ -public final class Apprentice extends AbstractNpcAI +final class Apprentice extends AbstractNpcAI { // NPCs private static final int APPRENTICE = 33124; diff --git a/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java b/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java index 1d80da1070..e1f267517c 100644 --- a/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/ArenaManager/ArenaManager.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Arena Manager AI. * @author St3eT */ -public final class ArenaManager extends AbstractNpcAI +final class ArenaManager extends AbstractNpcAI { // NPCs private static final int[] ARENA_MANAGER = diff --git a/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java b/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java index 1cb371913d..1f01437ff0 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java +++ b/trunk/dist/game/data/scripts/ai/npc/AvantGarde/AvantGarde.java @@ -38,7 +38,7 @@ import ai.npc.AbstractNpcAI; * Transformation skill learning and transformation scroll sell. * @author Zoey76 */ -public final class AvantGarde extends AbstractNpcAI +final class AvantGarde extends AbstractNpcAI { // NPC private static final int AVANT_GARDE = 32323; diff --git a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java index f939865eed..e954eefbc9 100644 --- a/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java +++ b/trunk/dist/game/data/scripts/ai/npc/AwakeningMaster/AwakeningMaster.java @@ -45,7 +45,7 @@ import quests.Q10338_SeizeYourDestiny.Q10338_SeizeYourDestiny; * AwakeningMaster AI. * @author Sdw */ -public final class AwakeningMaster extends AbstractNpcAI +final class AwakeningMaster extends AbstractNpcAI { // NPCs private static final int SIGEL_MASTER = 33397; diff --git a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java index 024b8dc749..1d331f505e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java +++ b/trunk/dist/game/data/scripts/ai/npc/BlackJudge/BlackJudge.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Black Judge AI. * @author St3eT */ -public class BlackJudge extends AbstractNpcAI +final class BlackJudge extends AbstractNpcAI { // NPC private static final int BLACK_JUDGE = 30981; diff --git a/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java b/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java index 1900fa7cf1..926b6cae62 100644 --- a/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java +++ b/trunk/dist/game/data/scripts/ai/npc/BlackMarketeerOfMammon/BlackMarketeerOfMammon.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Black Marketeer of Mammon AI. * @author St3eT */ -public final class BlackMarketeerOfMammon extends AbstractNpcAI +final class BlackMarketeerOfMammon extends AbstractNpcAI { // NPC private static final int BLACK_MARKETEER = 31092; diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java b/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java index 6f48ee1db3..56cc5e2eda 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleAmbassador/CastleAmbassador.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Castle Ambassador AI. * @author St3eT */ -public final class CastleAmbassador extends AbstractNpcAI +final class CastleAmbassador extends AbstractNpcAI { // NPCs // @formatter:off diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java b/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java index 96b7014227..564090335f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleBlacksmith/CastleBlacksmith.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Castle Blacksmith AI. * @author malyelfik */ -public final class CastleBlacksmith extends AbstractNpcAI +final class CastleBlacksmith extends AbstractNpcAI { // Blacksmith IDs private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java b/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java index 4dee3bef97..477d7f94b1 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleChamberlain/CastleChamberlain.java @@ -63,7 +63,7 @@ import ai.npc.AbstractNpcAI; * Castle Chamberlain AI. * @author malyelfik */ -public final class CastleChamberlain extends AbstractNpcAI +final class CastleChamberlain extends AbstractNpcAI { // NPCs //@formatter:off diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java b/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java index ebd26a113b..422eddbc86 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleCourtMagician/CastleCourtMagician.java @@ -30,7 +30,7 @@ import handlers.effecthandlers.CallPc; * Castle Court Magician AI. * @author St3eT */ -public final class CastleCourtMagician extends AbstractNpcAI +final class CastleCourtMagician extends AbstractNpcAI { // NPCs private static final int[] COURT_MAGICIAN = diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java b/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java index 4266e3b202..cebc68ce5c 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleMercenaryManager/CastleMercenaryManager.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Castle Mercenary Manager AI. * @author malyelfik */ -public final class CastleMercenaryManager extends AbstractNpcAI +final class CastleMercenaryManager extends AbstractNpcAI { // NPCs private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java b/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java index 27b8ee9c91..fff2311791 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleSiegeManager/CastleSiegeManager.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Castle Siege Manager AI. * @author St3eT */ -public final class CastleSiegeManager extends AbstractNpcAI +final class CastleSiegeManager extends AbstractNpcAI { // NPCs private static final int[] SIEGE_MANAGER = diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java index 6fe1beeed9..be0954aa77 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleTeleporter/CastleTeleporter.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Castle Teleporter AI. * @author malyelfik */ -public final class CastleTeleporter extends AbstractNpcAI +final class CastleTeleporter extends AbstractNpcAI { // Teleporter IDs private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java b/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java index 5b30ce2049..59f230fe75 100644 --- a/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java +++ b/trunk/dist/game/data/scripts/ai/npc/CastleWarehouse/CastleWarehouse.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Castle Warehouse Keeper AI. * @author malyelfik */ -public final class CastleWarehouse extends AbstractNpcAI +final class CastleWarehouse extends AbstractNpcAI { // NPCs private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java b/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java index b7904c34a5..1060f277e0 100644 --- a/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java +++ b/trunk/dist/game/data/scripts/ai/npc/ClanTrader/ClanTrader.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Clan Trader AI. * @author St3eT */ -public final class ClanTrader extends AbstractNpcAI +final class ClanTrader extends AbstractNpcAI { // Npc private static final int[] CLAN_TRADER = diff --git a/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java b/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java index adb682c484..edaf1c604e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/DimensionalManager/DimensionalManager.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * Dimensional Manager AI. * @author Stayway, Mobius */ -public final class DimensionalManager extends AbstractNpcAI +final class DimensionalManager extends AbstractNpcAI { // Npc private static final int DIMENSIONAL_MANAGER = 32478; @@ -40,6 +40,7 @@ public final class DimensionalManager extends AbstractNpcAI private static final int ROSE_SPIRIT = 21887; // Rewards private static final Map TICKET_REWARDS = new HashMap<>(); + { // Using SkillHolder to store ticket and reward ids. // buypass - coupon(skillId) - reward(skillLvl) diff --git a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java index a11426b308..02b941962a 100644 --- a/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java +++ b/trunk/dist/game/data/scripts/ai/npc/DragonVortex/DragonVortex.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * Dragon Vortex AI. * @author UnAfraid, improved by Adry_85 & DreamStage */ -public final class DragonVortex extends AbstractNpcAI +final class DragonVortex extends AbstractNpcAI { // NPC private static final int VORTEX = 32871; diff --git a/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java b/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java index 434aa003a6..b16e651c3f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/FameManager/FameManager.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Fame Manager AI. * @author St3eT */ -public final class FameManager extends AbstractNpcAI +final class FameManager extends AbstractNpcAI { // Npc private static final int[] FAME_MANAGER = diff --git a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java index cc52e69b50..40994cb997 100644 --- a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java +++ b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/ForgeOfTheGods.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Forge of the Gods AI * @author nonom, malyelfik */ -public final class ForgeOfTheGods extends AbstractNpcAI +final class ForgeOfTheGods extends AbstractNpcAI { // NPCs private static final int[] FOG_MOBS = diff --git a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java index bf2e735eec..45a4c142e1 100644 --- a/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java +++ b/trunk/dist/game/data/scripts/ai/npc/ForgeOfTheGods/Rooney.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Rooney AI * @author malyelfik */ -public final class Rooney extends AbstractNpcAI +final class Rooney extends AbstractNpcAI { // NPC private static final int ROONEY = 32049; diff --git a/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java b/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java index 9159ecea05..77462f75f7 100644 --- a/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java +++ b/trunk/dist/game/data/scripts/ai/npc/FortressArcherCaptain/FortressArcherCaptain.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Fortress Archer Captain AI. * @author St3eT */ -public final class FortressArcherCaptain extends AbstractNpcAI +final class FortressArcherCaptain extends AbstractNpcAI { // NPCs private static final int[] ARCHER_CAPTAIN = diff --git a/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java b/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java index 04b9ea4ba0..55257ae43f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/FortressSiegeManager/FortressSiegeManager.java @@ -33,7 +33,7 @@ import ai.npc.AbstractNpcAI; * Fortress Siege Manager AI. * @author St3eT */ -public final class FortressSiegeManager extends AbstractNpcAI +final class FortressSiegeManager extends AbstractNpcAI { // NPCs private static final int[] MANAGERS = diff --git a/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java b/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java index ef5a5d9cd9..3583cb747b 100644 --- a/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java +++ b/trunk/dist/game/data/scripts/ai/npc/FreyasSteward/FreyasSteward.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Freya's Steward AI. * @author Adry_85 */ -public final class FreyasSteward extends AbstractNpcAI +final class FreyasSteward extends AbstractNpcAI { // NPC private static final int FREYAS_STEWARD = 32029; diff --git a/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java b/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java index b1482ab14e..5c3daa2fd4 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java +++ b/trunk/dist/game/data/scripts/ai/npc/Jinia/Jinia.java @@ -27,7 +27,7 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra; * Jinia AI. * @author Adry_85 */ -public final class Jinia extends AbstractNpcAI +final class Jinia extends AbstractNpcAI { // NPC private static final int JINIA = 32781; diff --git a/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java b/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java index 827ca2a2b1..618236b6b8 100644 --- a/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java +++ b/trunk/dist/game/data/scripts/ai/npc/KetraOrcSupport/KetraOrcSupport.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Original Jython script by Emperorc and Kerberos_20. * @authors Nyaran */ -public final class KetraOrcSupport extends AbstractNpcAI +final class KetraOrcSupport extends AbstractNpcAI { private static class BuffsData { diff --git a/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java b/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java index c4f3e2b45a..78596126a7 100644 --- a/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java +++ b/trunk/dist/game/data/scripts/ai/npc/LaVieEnRose/LaVieEnRose.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * La Vie En Rose AI. * @author Sdw */ -public final class LaVieEnRose extends AbstractNpcAI +final class LaVieEnRose extends AbstractNpcAI { // NPCs private static final int LA_VIE_EN_ROSE = 33825; diff --git a/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java b/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java index 4d73a96e66..d121720216 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java +++ b/trunk/dist/game/data/scripts/ai/npc/Mammons/Mammons.java @@ -35,7 +35,7 @@ import ai.npc.AbstractNpcAI; * Mammons AI. * @author St3eT */ -public final class Mammons extends AbstractNpcAI +final class Mammons extends AbstractNpcAI { // NPCs private static final int MAMMONS[] = diff --git a/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java b/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java index 6bafb29d86..2407cea93b 100644 --- a/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/ManorManager/ManorManager.java @@ -43,7 +43,7 @@ import ai.npc.AbstractNpcAI; * Manor manager AI. * @author malyelfik */ -public final class ManorManager extends AbstractNpcAI +final class ManorManager extends AbstractNpcAI { private static final int[] NPC = { diff --git a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java index 6a5a0a4e40..1d735440bf 100644 --- a/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java +++ b/trunk/dist/game/data/scripts/ai/npc/MentorGuide/MentorGuide.java @@ -59,7 +59,7 @@ import ai.npc.AbstractNpcAI; * Mentor Guide. * @author Gnacik, UnAfraid */ -public class MentorGuide extends AbstractNpcAI implements IXmlReader +final class MentorGuide extends AbstractNpcAI implements IXmlReader { // NPCs private static final int MENTOR_GUIDE = 33587; diff --git a/trunk/dist/game/data/scripts/ai/npc/Milia/Milia.java b/trunk/dist/game/data/scripts/ai/npc/Milia/Milia.java index 2eccbcb20b..d2289e7993 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Milia/Milia.java +++ b/trunk/dist/game/data/scripts/ai/npc/Milia/Milia.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Milia AI. * @author St3eT */ -public final class Milia extends AbstractNpcAI +final class Milia extends AbstractNpcAI { // NPCs private static final int MILIA = 30006; diff --git a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java index a15003a8fc..2235f94294 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java +++ b/trunk/dist/game/data/scripts/ai/npc/Minigame/Minigame.java @@ -39,7 +39,7 @@ import ai.npc.AbstractNpcAI; * Monastery Minigame AI. * @author nonom */ -public final class Minigame extends AbstractNpcAI +final class Minigame extends AbstractNpcAI { private static final int SUMIEL = 32758; private static final int BURNER = 18913; diff --git a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/MonkOfChaos.java b/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/MonkOfChaos.java index fd10d838ae..721543b75e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/MonkOfChaos.java +++ b/trunk/dist/game/data/scripts/ai/npc/MonkOfChaos/MonkOfChaos.java @@ -36,7 +36,7 @@ import ai.npc.AbstractNpcAI; * Monk of Chaos AI. * @author Sdw */ -public final class MonkOfChaos extends AbstractNpcAI +final class MonkOfChaos extends AbstractNpcAI { private static final int MONK_OF_CHAOS = 33880; private static final int MIN_LEVEL = 85; diff --git a/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java b/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java index 2b231cf760..bd42304b49 100644 --- a/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java +++ b/trunk/dist/game/data/scripts/ai/npc/MonumentOfHeroes/MonumentOfHeroes.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Monument of Heroes AI. * @author Adry_85 */ -public final class MonumentOfHeroes extends AbstractNpcAI +final class MonumentOfHeroes extends AbstractNpcAI { // NPCs private static final int[] MONUMENTS = diff --git a/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java b/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java index 63f1001b84..2e436f5788 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java +++ b/trunk/dist/game/data/scripts/ai/npc/Nomi/Nomi.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Nomi AI. * @author Stayway */ -public final class Nomi extends AbstractNpcAI +final class Nomi extends AbstractNpcAI { // NPC private static final int NOMI = 34007; diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java index ba6901f247..258ea3c4f7 100644 --- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java +++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferAI.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.util.Util; /** * @author UnAfraid */ -public class NpcBufferAI implements Runnable +class NpcBufferAI implements Runnable { private final L2Npc _npc; private final NpcBufferSkillData _skillData; diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferData.java b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferData.java index be77f8941e..22d086552f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferData.java +++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferData.java @@ -23,12 +23,12 @@ import java.util.List; * NPC Buffers data. * @author UnAfraid */ -public class NpcBufferData +class NpcBufferData { private final int _id; private final List _skills = new ArrayList<>(); - public NpcBufferData(int id) + NpcBufferData(int id) { _id = id; } @@ -38,7 +38,7 @@ public class NpcBufferData return _id; } - public void addSkill(NpcBufferSkillData skill) + void addSkill(NpcBufferSkillData skill) { _skills.add(skill); } diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java index 8164b9a300..327f93e9b7 100644 --- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java +++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBufferSkillData.java @@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.skills.targets.AffectScope; /** * @author UnAfraid */ -public class NpcBufferSkillData +class NpcBufferSkillData { private final SkillHolder _skill; private final int _initialDelay; @@ -33,7 +33,7 @@ public class NpcBufferSkillData private final AffectScope _affectScope; private final AffectObject _affectObject; - public NpcBufferSkillData(StatsSet set) + NpcBufferSkillData(StatsSet set) { _skill = new SkillHolder(set.getInt("id"), set.getInt("level")); _initialDelay = set.getInt("skillInitDelay", 0) * 1000; diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java index 444bc5cc2d..6cba764dd1 100644 --- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java +++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffers.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; /** * @author UnAfraid */ -public final class NpcBuffers extends AbstractNpcAI +final class NpcBuffers extends AbstractNpcAI { private final NpcBuffersData _npcBuffers = new NpcBuffersData(); diff --git a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java index 7f18839b68..f8d1f6c8f7 100644 --- a/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java +++ b/trunk/dist/game/data/scripts/ai/npc/NpcBuffers/NpcBuffersData.java @@ -32,7 +32,7 @@ import com.l2jmobius.util.data.xml.IXmlReader; /** * @author UnAfraid */ -public class NpcBuffersData implements IXmlReader +class NpcBuffersData implements IXmlReader { private final Map _npcBuffers = new HashMap<>(); @@ -90,7 +90,7 @@ public class NpcBuffersData implements IXmlReader } } - public NpcBufferData getNpcBuffer(int npcId) + NpcBufferData getNpcBuffer(int npcId) { return _npcBuffers.get(npcId); } diff --git a/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java b/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java index 2aab4507b5..0183772382 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java +++ b/trunk/dist/game/data/scripts/ai/npc/Pantheon/Pantheon.java @@ -31,7 +31,7 @@ import quests.Q10320_LetsGoToTheCentralSquare.Q10320_LetsGoToTheCentralSquare; * Pantheon AI. * @author Gladicek */ -public final class Pantheon extends AbstractNpcAI +final class Pantheon extends AbstractNpcAI { // NPC private static final int PANTHEON = 32972; diff --git a/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java b/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java index 5ad5c00133..1d9d153b9d 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java +++ b/trunk/dist/game/data/scripts/ai/npc/Proclaimer/Proclaimer.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Proclaimer AI. * @author St3eT */ -public final class Proclaimer extends AbstractNpcAI +final class Proclaimer extends AbstractNpcAI { // NPCs private static final int[] PROCLAIMER = diff --git a/trunk/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java b/trunk/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java index 21122ae728..bb764aac80 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java +++ b/trunk/dist/game/data/scripts/ai/npc/Rafforty/Rafforty.java @@ -25,7 +25,7 @@ import ai.npc.AbstractNpcAI; * Rafforty AI. * @author malyelfik, Gladicek */ -public final class Rafforty extends AbstractNpcAI +final class Rafforty extends AbstractNpcAI { // NPC private static final int RAFFORTY = 32020; diff --git a/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java b/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java index a273a6b02c..d53f1a3fc4 100644 --- a/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java +++ b/trunk/dist/game/data/scripts/ai/npc/RemembranceTower/RemembranceTower.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Remembrance Tower AI. * @author St3eT */ -public final class RemembranceTower extends AbstractNpcAI +final class RemembranceTower extends AbstractNpcAI { // NPCs private static final int REMEMBRANCE_TOWER = 33989; diff --git a/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java b/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java index 3bc824ab2e..42bbf1662f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java +++ b/trunk/dist/game/data/scripts/ai/npc/Rignos/Rignos.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Rignos AI. * @author St3eT */ -public class Rignos extends AbstractNpcAI +final class Rignos extends AbstractNpcAI { // NPC private static final int RIGNOS = 32349; // Rignos diff --git a/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java b/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java index 3d3a1427f6..4826abb5fa 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java +++ b/trunk/dist/game/data/scripts/ai/npc/Scarecrow/Scarecrow.java @@ -24,7 +24,7 @@ import ai.npc.AbstractNpcAI; * Scarecrow AI. * @author ivantotov */ -public final class Scarecrow extends AbstractNpcAI +final class Scarecrow extends AbstractNpcAI { // NPCs private static final int TRAINING_DUMMY = 19546; diff --git a/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java b/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java index b444c717ef..4439ac8ff5 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java +++ b/trunk/dist/game/data/scripts/ai/npc/Sirra/Sirra.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Sirra AI. * @author St3eT */ -public final class Sirra extends AbstractNpcAI +final class Sirra extends AbstractNpcAI { // NPC private static final int SIRRA = 32762; diff --git a/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java b/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java index 68da2514a0..e3f669b50d 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java +++ b/trunk/dist/game/data/scripts/ai/npc/Summons/MerchantGolem/GolemTrader.java @@ -24,7 +24,7 @@ import ai.npc.AbstractNpcAI; * Golem Trader AI. * @author Zoey76 */ -public final class GolemTrader extends AbstractNpcAI +final class GolemTrader extends AbstractNpcAI { // NPC private static final int GOLEM_TRADER = 13128; diff --git a/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java b/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java index 3da8e5ba65..df825e3c88 100644 --- a/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java +++ b/trunk/dist/game/data/scripts/ai/npc/SupportUnitCaptain/SupportUnitCaptain.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Support Unit Captain AI. * @author St3eT */ -public final class SupportUnitCaptain extends AbstractNpcAI +final class SupportUnitCaptain extends AbstractNpcAI { // NPCs private static final int[] UNIT_CAPTAIN = diff --git a/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java b/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java index 54a6a5c7fa..a4de8d6516 100644 --- a/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java +++ b/trunk/dist/game/data/scripts/ai/npc/SymbolMaker/SymbolMaker.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Symbol Maker AI. * @author Adry_85 */ -public final class SymbolMaker extends AbstractNpcAI +final class SymbolMaker extends AbstractNpcAI { // NPCs private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java index 031ca816aa..249ea7590b 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/AnghelWaterfallPortal/AnghelWaterfallPortal.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Anghel Waterfall Portal teleport AI. * @author Mobius */ -public final class AnghelWaterfallPortal extends AbstractNpcAI +final class AnghelWaterfallPortal extends AbstractNpcAI { private static final int ZONE_ID = 200200; private static final Location TELEPORT_LOC = new Location(207559, 86429, -1000); diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java index 993570a859..75e6240989 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/CrumaTower/CrumaTower.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Cruma Tower teleport AI. * @author Stayway */ -public final class CrumaTower extends AbstractNpcAI +final class CrumaTower extends AbstractNpcAI { // NPC private static final int CARSUS = 30483; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java index 316793cfa4..58cbd0c289 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/DarkOmens/DarkOmens.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Dark Omens teleport AI. * @author Stayway */ -public final class DarkOmens extends AbstractNpcAI +final class DarkOmens extends AbstractNpcAI { // NPC private static final int ZIGURAT_IN = 31118; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java index 51eaa70af2..43326911b7 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/DelusionTeleport/DelusionTeleport.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Chambers of Delusion teleport AI. * @author GKR */ -public final class DelusionTeleport extends AbstractNpcAI +final class DelusionTeleport extends AbstractNpcAI { // NPCs private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java index d1d9bced14..bd77c6bd38 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/ElrokiTeleporters/ElrokiTeleporters.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Elroki teleport AI. * @author Plim */ -public final class ElrokiTeleporters extends AbstractNpcAI +final class ElrokiTeleporters extends AbstractNpcAI { // NPCs private static final int ORAHOCHIN = 32111; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java index 5de17b74ec..5deb0fd428 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GainakUndergroundEntrance/GainakUndergroundEntrance.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Gainak Underground Entrance teleport AI. * @author Mobius */ -public final class GainakUndergroundEntrance extends AbstractNpcAI +final class GainakUndergroundEntrance extends AbstractNpcAI { // Zones private static final int ZONE_ID_1 = 200207; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java index fcc368447e..5d0e3d4b7d 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GiantServant/GiantServant.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Hermuncus Minion AI. * @author ChaosPaladin */ -public final class GiantServant extends AbstractNpcAI +final class GiantServant extends AbstractNpcAI { // NPCs private static final int[] NPCs = diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java index 82888340ac..995d19bf49 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/GrandBossTeleporters/GrandBossTeleporters.java @@ -36,7 +36,7 @@ import ai.npc.AbstractNpcAI; * Original python script by Emperorc. * @author Plim */ -public final class GrandBossTeleporters extends AbstractNpcAI +final class GrandBossTeleporters extends AbstractNpcAI { // NPCs private static final int[] NPCs = diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java index 48e4e3d463..e9b717d29d 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/Klemis/Klemis.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Klemis AI. * @author St3eT */ -public class Klemis extends AbstractNpcAI +final class Klemis extends AbstractNpcAI { // NPC private static final int KLEMIS = 32734; // Klemis diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java index a36be17d00..1f6186249f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/MithrilMinesTeleporter/MithrilMinesTeleporter.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Mithril Mines teleport AI. * @author Charus */ -public final class MithrilMinesTeleporter extends AbstractNpcAI +final class MithrilMinesTeleporter extends AbstractNpcAI { // NPC private final static int TELEPORT_CRYSTAL = 32652; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java index 17fd748495..d70512eaeb 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/NewbieTravelToken/NewbieTravelToken.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Newbie Travel Token AI. * @author Plim */ -public final class NewbieTravelToken extends AbstractNpcAI +final class NewbieTravelToken extends AbstractNpcAI { // Item private static final int NEWBIE_TRAVEL_TOKEN = 8542; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java index 141f52dc2f..8e71ec2b2b 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/NoblesseTeleport/NoblesseTeleport.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Original Jython script by Ham Wong. * @author Plim */ -public final class NoblesseTeleport extends AbstractNpcAI +final class NoblesseTeleport extends AbstractNpcAI { // Item private static final int OLYMPIAD_TOKEN = 13722; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/OrbisTemple/OrbisTemple.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/OrbisTemple/OrbisTemple.java index 11d9c145c4..4be38836d9 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/OrbisTemple/OrbisTemple.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/OrbisTemple/OrbisTemple.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Orbis Temple teleport AI. * @author Mobius */ -public final class OrbisTemple extends AbstractNpcAI +final class OrbisTemple extends AbstractNpcAI { // Zones private static final int ZONE_ID_1 = 200201; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java index 98d51a575f..190a337270 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/PaganTeleporters/PaganTeleporters.java @@ -30,7 +30,7 @@ import ai.npc.AbstractNpcAI; * Original Jython script by BiTi. * @author Plim */ -public final class PaganTeleporters extends AbstractNpcAI +final class PaganTeleporters extends AbstractNpcAI { // NPCs private static final int TRIOLS_MIRROR_1 = 32039; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java index 91cc1d907e..a5ea4f72ff 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/SeparatedSoul/SeparatedSoul.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Separated Soul teleport AI. * @author UnAfraid, improved by Adry_85, Zealar */ -public final class SeparatedSoul extends AbstractNpcAI +final class SeparatedSoul extends AbstractNpcAI { // NPCs private static final int[] SEPARATED_SOULS = diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java index 33effa6b4f..88779dc861 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StakatoNestTeleporter/StakatoNestTeleporter.java @@ -28,7 +28,7 @@ import quests.Q00240_ImTheOnlyOneYouCanTrust.Q00240_ImTheOnlyOneYouCanTrust; * Stakato Nest Teleport AI. * @author Charus */ -public final class StakatoNestTeleporter extends AbstractNpcAI +final class StakatoNestTeleporter extends AbstractNpcAI { // Locations private final static Location[] LOCS = diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java index 4e9e1335a2..5bb49806bf 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/SteelCitadelTeleport/SteelCitadelTeleport.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Steel Citadel teleport AI. * @author GKR */ -public final class SteelCitadelTeleport extends AbstractNpcAI +final class SteelCitadelTeleport extends AbstractNpcAI { // NPCs private static final int BELETH = 29118; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java index f28c29b16a..55ad9c28e8 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/StrongholdsTeleports/StrongholdsTeleports.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Original Jython script by Kerberos. * @author Plim */ -public final class StrongholdsTeleports extends AbstractNpcAI +final class StrongholdsTeleports extends AbstractNpcAI { // NPCs private final static int[] NPCs = diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java index 45232f51e3..590fe572f3 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/Survivor/Survivor.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; * Original Jython script by Kerberos. * @author Plim */ -public final class Survivor extends AbstractNpcAI +final class Survivor extends AbstractNpcAI { // NPC private static final int SURVIVOR = 32632; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java index 3bb3025e1c..c5ab9e3189 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToFantasy/TeleportToFantasy.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Fantasy Island teleport AI. * @author Plim */ -public final class TeleportToFantasy extends AbstractNpcAI +final class TeleportToFantasy extends AbstractNpcAI { // NPC private static final int PADDIES = 32378; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java index 4b1be9c8a2..185ff55812 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToRaceTrack/TeleportToRaceTrack.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * Monster Derby Track teleport AI. * @author Plim */ -public final class TeleportToRaceTrack extends AbstractNpcAI +final class TeleportToRaceTrack extends AbstractNpcAI { // NPC private static final int RACE_MANAGER = 30995; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java index d8ef722714..d73a637944 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportToUndergroundColiseum/TeleportToUndergroundColiseum.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Underground Coliseum teleport AI * @author malyelfik */ -public final class TeleportToUndergroundColiseum extends AbstractNpcAI +final class TeleportToUndergroundColiseum extends AbstractNpcAI { // NPCs private static final int COLISEUM_HELPER = 32491; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java index 26e04ff43a..cfb1ca596e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/TeleportWithCharm/TeleportWithCharm.java @@ -27,7 +27,7 @@ import ai.npc.AbstractNpcAI; * Original Jython script by DraX. * @author Plim */ -public final class TeleportWithCharm extends AbstractNpcAI +final class TeleportWithCharm extends AbstractNpcAI { // NPCs private final static int WHIRPY = 30540; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java index 4ce6d1f85b..5938c5535f 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/ToIVortex/ToIVortex.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Reworked by xban1x. * @author Plim */ -public final class ToIVortex extends AbstractNpcAI +final class ToIVortex extends AbstractNpcAI { // NPCs private static final int KEPLON = 30949; diff --git a/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java b/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java index 2919cca6ff..2779b9798d 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java +++ b/trunk/dist/game/data/scripts/ai/npc/Teleports/Warpgate/Warpgate.java @@ -31,7 +31,7 @@ import ai.npc.AbstractNpcAI; * @author _DS_ * @Updated to Ertheia by Mobius */ -public final class Warpgate extends AbstractNpcAI +final class Warpgate extends AbstractNpcAI { // NPCs private static final int EXIT_GATE = 33902; diff --git a/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java b/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java index 6f1d131157..a2f6c64381 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java +++ b/trunk/dist/game/data/scripts/ai/npc/Toyron/Toyron.java @@ -29,7 +29,7 @@ import quests.Q10327_IntruderWhoWantsTheBookOfGiants.Q10327_IntruderWhoWantsTheB /** * @author Neanrakyr */ -public final class Toyron extends AbstractNpcAI +final class Toyron extends AbstractNpcAI { // NPC private static final int TOYRON = 33004; diff --git a/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java b/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java index 8eb50094e0..913322c16e 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java +++ b/trunk/dist/game/data/scripts/ai/npc/Trainers/HealerTrainer/HealerTrainer.java @@ -36,7 +36,7 @@ import ai.npc.AbstractNpcAI; * Trainer healers AI. * @author Zoey76 */ -public final class HealerTrainer extends AbstractNpcAI +final class HealerTrainer extends AbstractNpcAI { // NPC // @formatter:off diff --git a/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java b/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java index eb7f374f76..4972460844 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java +++ b/trunk/dist/game/data/scripts/ai/npc/Tunatun/Tunatun.java @@ -27,7 +27,7 @@ import quests.Q00020_BringUpWithLove.Q00020_BringUpWithLove; * Beast Herder Tunatun AI. * @author Adry_85 */ -public final class Tunatun extends AbstractNpcAI +final class Tunatun extends AbstractNpcAI { // NPC private static final int TUNATUN = 31537; diff --git a/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java b/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java index 4ee1dd9a5b..e9aeca1a40 100644 --- a/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/trunk/dist/game/data/scripts/ai/npc/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Original Jython script by Emperorc and Kerberos_20. * @author Nyaran */ -public final class VarkaSilenosSupport extends AbstractNpcAI +final class VarkaSilenosSupport extends AbstractNpcAI { private static class BuffsData { diff --git a/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java b/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java index 8247d73cad..bfd2e281b3 100644 --- a/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java +++ b/trunk/dist/game/data/scripts/ai/npc/VillageMasters/FirstClassTransferTalk/FirstClassTransferTalk.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * None of them provide actual class transfers, they only talk about it. * @author jurchiks, xban1x */ -public final class FirstClassTransferTalk extends AbstractNpcAI +final class FirstClassTransferTalk extends AbstractNpcAI { private static final Map MASTERS = new HashMap<>(); static diff --git a/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java b/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java index fd52ce1579..7919621e34 100644 --- a/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java +++ b/trunk/dist/game/data/scripts/ai/npc/WeaverOlf/WeaverOlf.java @@ -29,7 +29,7 @@ import ai.npc.AbstractNpcAI; * Weaver Olf - Pins And Pouch Unseal AI. * @author Gigiikun, Bloodshed, Adry_85 */ -public final class WeaverOlf extends AbstractNpcAI +final class WeaverOlf extends AbstractNpcAI { // NPCs private static final int[] NPCs = diff --git a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java index 2ade6371ce..9a6f549c27 100644 --- a/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java +++ b/trunk/dist/game/data/scripts/ai/npc/WyvernManager/WyvernManager.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Wyvern Manager * @author xban1x */ -public final class WyvernManager extends AbstractNpcAI +final class WyvernManager extends AbstractNpcAI { private enum ManagerType { diff --git a/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java b/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java index c967b16274..797bb30d7c 100644 --- a/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java +++ b/trunk/dist/game/data/scripts/ai/npc/Zenya/Zenya.java @@ -26,7 +26,7 @@ import ai.npc.AbstractNpcAI; * Zenya AI. * @author Stayway */ -public final class Zenya extends AbstractNpcAI +final class Zenya extends AbstractNpcAI { // NPC private static final int ZENYA = 32140; diff --git a/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java b/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java index 1d668867f2..6b791c5d50 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/DevastatedCastle/DevastatedCastle.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.network.NpcStringId; * Devastated Castle clan hall siege script. * @author BiggBoss */ -public final class DevastatedCastle extends ClanHallSiegeEngine +final class DevastatedCastle extends ClanHallSiegeEngine { private static final int GUSTAV = 35410; private static final int MIKHAIL = 35409; diff --git a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java index d92e9d9aa1..3704ef5810 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfResistance/FortressOfResistance.java @@ -35,7 +35,7 @@ import com.l2jmobius.gameserver.util.Util; * Fortress of Resistance clan hall siege Script. * @author BiggBoss */ -public final class FortressOfResistance extends ClanHallSiegeEngine +final class FortressOfResistance extends ClanHallSiegeEngine { private final int MESSENGER = 35382; private final int BLOODY_LORD_NURKA = 35375; diff --git a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java index 577c932ead..6c77258ad8 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/FortressOfTheDead/FortressOfTheDead.java @@ -34,7 +34,7 @@ import com.l2jmobius.gameserver.network.NpcStringId; * Fortress of the Dead clan hall siege script. * @author BiggBoss */ -public final class FortressOfTheDead extends ClanHallSiegeEngine +final class FortressOfTheDead extends ClanHallSiegeEngine { private static final int LIDIA = 35629; private static final int ALFRED = 35630; diff --git a/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java b/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java index edaa133922..a171087d4d 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java @@ -62,9 +62,9 @@ import com.l2jmobius.gameserver.util.Util; * Rainbow Springs Chateau clan hall siege script. * @author BiggBoss */ -public final class RainbowSpringsChateau extends ClanHallSiegeEngine +final class RainbowSpringsChateau extends ClanHallSiegeEngine { - protected static class SetFinalAttackers implements Runnable + static class SetFinalAttackers implements Runnable { @Override public void run() @@ -129,7 +129,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine } } - protected static class SiegeStart implements Runnable + static class SiegeStart implements Runnable { @Override public void run() @@ -187,7 +187,7 @@ public final class RainbowSpringsChateau extends ClanHallSiegeEngine } } - protected static class TeleportBack implements Runnable + static class TeleportBack implements Runnable { @Override public void run() diff --git a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java index 0e568f5ce1..4194de3836 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/BanditStronghold/BanditStronghold.java @@ -27,7 +27,7 @@ import conquerablehalls.flagwar.FlagWar; /** * @author BiggBoss */ -public final class BanditStronghold extends FlagWar +final class BanditStronghold extends FlagWar { static { diff --git a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java index 8ea5eb4900..04f516049d 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/FlagWar.java @@ -89,8 +89,8 @@ public abstract class FlagWar extends ClanHallSiegeEngine protected static Location CENTER; - protected Map _data = new HashMap<>(6); - protected L2Clan _winner; + private final Map _data = new HashMap<>(6); + private L2Clan _winner; private boolean _firstPhase; public FlagWar(String name, int hallId) @@ -506,11 +506,11 @@ public abstract class FlagWar extends ClanHallSiegeEngine * Runnable class to schedule doors closing and siege start. * @author Zoey76 */ - protected class CloseOutterDoorsTask implements Runnable + private class CloseOutterDoorsTask implements Runnable { private final Siegable _siegable; - protected CloseOutterDoorsTask(Siegable clanHallSiege) + CloseOutterDoorsTask(Siegable clanHallSiege) { _siegable = clanHallSiege; } @@ -620,7 +620,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine return false; } - void doSpawns(int clanId, ClanData data) + private void doSpawns(int clanId, ClanData data) { try { @@ -888,8 +888,8 @@ public abstract class FlagWar extends ClanHallSiegeEngine { int flag = 0; int npc = 0; - List players = new ArrayList<>(18); - List playersInstance = new ArrayList<>(18); + final List players = new ArrayList<>(18); + final List playersInstance = new ArrayList<>(18); L2Spawn warrior = null; L2Spawn flagInstance = null; } diff --git a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java index c811620c22..b78e057d0b 100644 --- a/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java +++ b/trunk/dist/game/data/scripts/conquerablehalls/flagwar/WildBeastReserve/WildBeastReserve.java @@ -27,7 +27,7 @@ import conquerablehalls.flagwar.FlagWar; /** * @author BiggBoss */ -public final class WildBeastReserve extends FlagWar +final class WildBeastReserve extends FlagWar { static { diff --git a/trunk/dist/game/data/scripts/cron/example.java b/trunk/dist/game/data/scripts/cron/example.java index ac8df42dc9..a35cee2e94 100644 --- a/trunk/dist/game/data/scripts/cron/example.java +++ b/trunk/dist/game/data/scripts/cron/example.java @@ -16,7 +16,7 @@ */ package cron; -public class example +final class example { public static void main(String[] args) { diff --git a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java index 7f97cfc369..b2948a1240 100644 --- a/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java +++ b/trunk/dist/game/data/scripts/custom/FactionManager/FactionManager.java @@ -28,7 +28,7 @@ import ai.npc.AbstractNpcAI; /** * @author Mobius */ -public class FactionManager extends AbstractNpcAI +final class FactionManager extends AbstractNpcAI { // NPC private static final int MANAGER = Config.FACTION_MANAGER_NPCID; diff --git a/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java b/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java index 404c26866a..1681b6e221 100644 --- a/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java +++ b/trunk/dist/game/data/scripts/custom/ShadowWeapons/ShadowWeapons.java @@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; * Original Jython script by DrLecter. * @author Nyaran, jurchiks */ -public final class ShadowWeapons extends Quest +final class ShadowWeapons extends Quest { // @formatter:off private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java b/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java index 515032ca7b..5c107f3a24 100644 --- a/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java +++ b/trunk/dist/game/data/scripts/custom/events/Elpies/Elpies.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.quest.Event; import com.l2jmobius.gameserver.util.Broadcast; -public final class Elpies extends Event +final class Elpies extends Event { // NPC private static final int ELPY = 900100; diff --git a/trunk/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java b/trunk/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java index c90fd1b728..3713b11d7e 100644 --- a/trunk/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java +++ b/trunk/dist/game/data/scripts/custom/events/Rabbits/Rabbits.java @@ -36,7 +36,7 @@ import com.l2jmobius.gameserver.util.Util; * Chests are hidden at Fantasy Isle and players must use the Rabbit transformation's skills to find and open them. * @author Gnacik, Zoey76 */ -public final class Rabbits extends Event +final class Rabbits extends Event { // NPCs private static final int NPC_MANAGER = 900101; diff --git a/trunk/dist/game/data/scripts/custom/events/Race/Race.java b/trunk/dist/game/data/scripts/custom/events/Race/Race.java index 6e23cc3d15..01464b37e2 100644 --- a/trunk/dist/game/data/scripts/custom/events/Race/Race.java +++ b/trunk/dist/game/data/scripts/custom/events/Race/Race.java @@ -37,7 +37,7 @@ import com.l2jmobius.gameserver.util.Broadcast; /** * @author Gnacik */ -public final class Race extends Event +final class Race extends Event { // Event NPC's list private final Set _npcs = ConcurrentHashMap.newKeySet(); diff --git a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java index bd57829020..402a963531 100644 --- a/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java +++ b/trunk/dist/game/data/scripts/custom/events/TvT/TvTManager/TvTManager.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * TvT Manager AI. * @author Zoey76 */ -public final class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler +final class TvTManager extends AbstractNpcAI implements IVoicedCommandHandler { private static final int MANAGER_ID = 70010; private static final String[] COMMANDS = diff --git a/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java b/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java index 39d1df16ad..9cc3b80595 100644 --- a/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java +++ b/trunk/dist/game/data/scripts/custom/events/Wedding/Wedding.java @@ -35,7 +35,7 @@ import ai.npc.AbstractNpcAI; * Wedding AI. * @author Zoey76 */ -public final class Wedding extends AbstractNpcAI +final class Wedding extends AbstractNpcAI { // NPC private static final int MANAGER_ID = 50007; diff --git a/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java b/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java index 2e0e10d685..49473b5964 100644 --- a/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java +++ b/trunk/dist/game/data/scripts/events/CharacterBirthday/CharacterBirthday.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.util.Util; * Updated to H5 by Nyaran. * @author Gnacik */ -public final class CharacterBirthday extends Quest +final class CharacterBirthday extends Quest { private static final int ALEGRIA = 32600; private static int SPAWNS = 0; diff --git a/trunk/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java b/trunk/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java index 56f74fbb0d..135d5c605b 100644 --- a/trunk/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java +++ b/trunk/dist/game/data/scripts/events/EveTheFortuneTeller/EveTheFortuneTeller.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.util.Broadcast; * Info - http://www.lineage2.com/en/news/events/11182015-eve-the-fortune-teller-returns.php * @author Mobius */ -public final class EveTheFortuneTeller extends LongTimeEvent +final class EveTheFortuneTeller extends LongTimeEvent { // NPCs private static final int EVE = 8542; diff --git a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java index 4c998405f2..97b2a08b50 100644 --- a/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java +++ b/trunk/dist/game/data/scripts/events/FreyaCelebration/FreyaCelebration.java @@ -33,7 +33,7 @@ import com.l2jmobius.gameserver.util.Util; * Freya Celebration event AI. * @author Gnacik */ -public final class FreyaCelebration extends LongTimeEvent +final class FreyaCelebration extends LongTimeEvent { // NPC private static final int FREYA = 13296; diff --git a/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java b/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java index 507d39ef49..1b7d77b016 100644 --- a/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java +++ b/trunk/dist/game/data/scripts/events/GiftOfVitality/GiftOfVitality.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; * Gift of Vitality event AI. * @author Gnacik, Adry_85 */ -public final class GiftOfVitality extends LongTimeEvent +final class GiftOfVitality extends LongTimeEvent { // NPC private static final int STEVE_SHYAGEL = 4306; diff --git a/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java b/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java index 49699a2b82..07bfcc3f82 100644 --- a/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java +++ b/trunk/dist/game/data/scripts/events/HeavyMedal/HeavyMedal.java @@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.event.LongTimeEvent; * Heavy Medals event AI. * @author Gnacik */ -public final class HeavyMedal extends LongTimeEvent +final class HeavyMedal extends LongTimeEvent { private final static int CAT_ROY = 31228; private final static int CAT_WINNIE = 31229; diff --git a/trunk/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java b/trunk/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java index a3b6550c1c..e9651f44d8 100644 --- a/trunk/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java +++ b/trunk/dist/game/data/scripts/events/HuntForSanta/HuntForSanta.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.util.Util; * Info - http://www.lineage2.com/en/news/events/hunt-for-santa.php * @author Mobius */ -public final class HuntForSanta extends LongTimeEvent +final class HuntForSanta extends LongTimeEvent { // NPC private static final int NOELLE = 34008; diff --git a/trunk/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java b/trunk/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java index 0fb06b1ac0..fdbcb98980 100644 --- a/trunk/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java +++ b/trunk/dist/game/data/scripts/events/LoveYourGatekeeper/LoveYourGatekeeper.java @@ -28,7 +28,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; * Love Your Gatekeeper event. * @author Gladicek */ -public final class LoveYourGatekeeper extends LongTimeEvent +final class LoveYourGatekeeper extends LongTimeEvent { // NPC private static final int GATEKEEPER = 32477; diff --git a/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java b/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java index f34c6b0a58..52416d8fdc 100644 --- a/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java +++ b/trunk/dist/game/data/scripts/events/MasterOfEnchanting/MasterOfEnchanting.java @@ -29,7 +29,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; * Master of Enchanting event AI. * @author Gnacik */ -public final class MasterOfEnchanting extends LongTimeEvent +final class MasterOfEnchanting extends LongTimeEvent { // NPC private static final int MASTER_YOGI = 32599; diff --git a/trunk/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java b/trunk/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java index 50bf66f287..b7ccd827ae 100644 --- a/trunk/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java +++ b/trunk/dist/game/data/scripts/events/TheValentineEvent/TheValentineEvent.java @@ -25,7 +25,7 @@ import com.l2jmobius.gameserver.model.event.LongTimeEvent; * The Valentine Event event AI. * @author Gnacik */ -public final class TheValentineEvent extends LongTimeEvent +final class TheValentineEvent extends LongTimeEvent { // NPC private static final int NPC = 4301; diff --git a/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java b/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java index b793a73a8a..ee1697568b 100644 --- a/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java +++ b/trunk/dist/game/data/scripts/features/SkillTransfer/SkillTransfer.java @@ -34,7 +34,7 @@ import ai.npc.AbstractNpcAI; * Skill Transfer feature. * @author Zoey76 */ -public final class SkillTransfer extends AbstractNpcAI +final class SkillTransfer extends AbstractNpcAI { private static final String HOLY_POMANDER = "HOLY_POMANDER_"; private static final ItemHolder[] PORMANDERS = diff --git a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java index 8aa9ad0655..bf320a81b1 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java +++ b/trunk/dist/game/data/scripts/gracia/AI/EnergySeeds.java @@ -52,7 +52,7 @@ public class EnergySeeds extends AbstractNpcAI private static final int RESPAWN = 480000; private static final int RANDOM_RESPAWN_OFFSET = 180000; private static final Map SPAWNS = new HashMap<>(); - protected static final Map _spawnedNpcs = new ConcurrentHashMap<>(); + static final Map _spawnedNpcs = new ConcurrentHashMap<>(); private static final int TEMPORARY_TELEPORTER = 32602; // @formatter:off @@ -100,7 +100,7 @@ public class EnergySeeds extends AbstractNpcAI startAI(); } - protected boolean isSeedActive(GraciaSeeds seed) + boolean isSeedActive(GraciaSeeds seed) { switch (seed) { @@ -290,7 +290,7 @@ public class EnergySeeds extends AbstractNpcAI return super.onEnterZone(character, zone); } - public void startAI() + private void startAI() { // spawn all NPCs for (ESSpawn spawn : SPAWNS.values()) @@ -302,7 +302,7 @@ public class EnergySeeds extends AbstractNpcAI } } - public void startAI(GraciaSeeds type) + private void startAI(GraciaSeeds type) { // spawn all NPCs for (ESSpawn spawn : SPAWNS.values()) @@ -314,7 +314,7 @@ public class EnergySeeds extends AbstractNpcAI } } - public void stopAI(GraciaSeeds type) + private void stopAI(GraciaSeeds type) { for (L2Npc seed : _spawnedNpcs.keySet()) { @@ -325,7 +325,7 @@ public class EnergySeeds extends AbstractNpcAI } } - public void seedCollectEvent(L2PcInstance player, L2Npc seedEnergy, GraciaSeeds seedType) + private void seedCollectEvent(L2PcInstance player, L2Npc seedEnergy, GraciaSeeds seedType) { if (player == null) { diff --git a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java index d4b4a284cd..83c8175a1e 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java +++ b/trunk/dist/game/data/scripts/gracia/AI/Lindvior.java @@ -108,13 +108,13 @@ public class Lindvior extends AbstractNpcAI return super.onAdvEvent(event, npc, player); } - public void scheduleNextLindviorVisit() + private void scheduleNextLindviorVisit() { final long delay = (ALT_MODE) ? ALT_MODE_MIN * 60000 : scheduleNextLindviorDate(); startQuestTimer("start", delay, null, null); } - protected long scheduleNextLindviorDate() + private long scheduleNextLindviorDate() { final GregorianCalendar date = new GregorianCalendar(); date.set(Calendar.MINUTE, RESET_MIN); diff --git a/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java b/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java index e518b457de..7512e9c67c 100644 --- a/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java +++ b/trunk/dist/game/data/scripts/gracia/AI/SeedOfAnnihilation/SeedOfAnnihilation.java @@ -94,7 +94,7 @@ public class SeedOfAnnihilation extends AbstractNpcAI startEffectZonesControl(); } - public void loadSeedRegionData() + private void loadSeedRegionData() { // Bistakon data _regionsData[0] = new SeedRegion(new int[] diff --git a/trunk/dist/game/data/scripts/gracia/GraciaLoader.java b/trunk/dist/game/data/scripts/gracia/GraciaLoader.java index 150afef464..e5116016c8 100644 --- a/trunk/dist/game/data/scripts/gracia/GraciaLoader.java +++ b/trunk/dist/game/data/scripts/gracia/GraciaLoader.java @@ -44,7 +44,7 @@ import gracia.vehicles.SoIController.SoIController; * Gracia class-loader. * @author Pandragon */ -public final class GraciaLoader +final class GraciaLoader { private static final Logger _log = Logger.getLogger(GraciaLoader.class.getName()); diff --git a/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java b/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java index 004292a472..563b7583b4 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SecretArea/SecretArea.java @@ -30,7 +30,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; */ public final class SecretArea extends Quest { - protected class SAWorld extends InstanceWorld + class SAWorld extends InstanceWorld { } @@ -53,7 +53,7 @@ public final class SecretArea extends Quest addTalkId(LELRIKIA); } - protected void enterInstance(L2PcInstance player) + private void enterInstance(L2PcInstance player) { InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); diff --git a/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java b/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java index aa3e4e878e..0e4e3d61ba 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SeedOfDestruction/Stage1.java @@ -74,24 +74,24 @@ import com.l2jmobius.gameserver.util.Util; */ public final class Stage1 extends Quest { - protected class SOD1World extends InstanceWorld + class SOD1World extends InstanceWorld { - public Map npcList = new HashMap<>(); - public int deviceSpawnedMobCount = 0; - public Lock lock = new ReentrantLock(); + final Map npcList = new HashMap<>(); + int deviceSpawnedMobCount = 0; + final Lock lock = new ReentrantLock(); } - protected static class SODSpawn + static class SODSpawn { - public boolean isZone = false; - public boolean isNeededNextFlag = false; - public int npcId; - public int x = 0; - public int y = 0; - public int z = 0; - public int h = 0; - public int zone = 0; - public int count = 0; + boolean isZone = false; + boolean isNeededNextFlag = false; + int npcId; + int x = 0; + int y = 0; + int z = 0; + int h = 0; + int zone = 0; + int count = 0; } private static final int INSTANCEID = 110; // this is the client number @@ -517,7 +517,7 @@ public final class Stage1 extends Quest return true; } - protected int enterInstance(L2PcInstance player, String template, Location loc) + private int enterInstance(L2PcInstance player, String template, Location loc) { int instanceId = 0; // check for existing instances for this player @@ -570,7 +570,7 @@ public final class Stage1 extends Quest return instanceId; } - protected boolean checkKillProgress(L2Npc mob, SOD1World world) + private boolean checkKillProgress(L2Npc mob, SOD1World world) { if (world.npcList.containsKey(mob)) { @@ -625,7 +625,7 @@ public final class Stage1 extends Quest } } - protected boolean spawnState(SOD1World world) + private boolean spawnState(SOD1World world) { if (world.lock.tryLock()) { @@ -709,7 +709,7 @@ public final class Stage1 extends Quest return false; } - protected void spawn(SOD1World world, int npcId, int x, int y, int z, int h, boolean addToKillTable) + private void spawn(SOD1World world, int npcId, int x, int y, int z, int h, boolean addToKillTable) { // traps if ((npcId >= 18720) && (npcId <= 18774)) @@ -762,7 +762,7 @@ public final class Stage1 extends Quest } } - protected void setInstanceTimeRestrictions(SOD1World world) + private void setInstanceTimeRestrictions(SOD1World world) { final Calendar reenter = Calendar.getInstance(); reenter.set(Calendar.MINUTE, RESET_MIN); diff --git a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java index ba87dc0d8a..a4ca2a21b6 100644 --- a/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java +++ b/trunk/dist/game/data/scripts/gracia/instances/SeedOfInfinity/HallOfSuffering/HallOfSuffering.java @@ -51,17 +51,17 @@ import ai.npc.AbstractNpcAI; */ public final class HallOfSuffering extends AbstractNpcAI { - protected class HSWorld extends InstanceWorld + class HSWorld extends InstanceWorld { - public Map npcList = new HashMap<>(); - public L2Npc klodekus = null; - public L2Npc klanikus = null; - public boolean isBossesAttacked = false; - public long startTime = 0; - public String ptLeaderName = ""; - public int rewardItemId = -1; - public String rewardHtm = ""; - public boolean isRewarded = false; + final Map npcList = new HashMap<>(); + L2Npc klodekus = null; + L2Npc klanikus = null; + boolean isBossesAttacked = false; + long startTime = 0; + String ptLeaderName = ""; + int rewardItemId = -1; + String rewardHtm = ""; + boolean isRewarded = false; } // NPCs diff --git a/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java b/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java index e0c4b527e9..eca17a729b 100644 --- a/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java +++ b/trunk/dist/game/data/scripts/gracia/vehicles/AirShipController.java @@ -42,7 +42,7 @@ import com.l2jmobius.gameserver.network.serverpackets.SystemMessage; public abstract class AirShipController extends Quest { - protected final class DecayTask implements Runnable + final class DecayTask implements Runnable { @Override public void run() @@ -54,7 +54,7 @@ public abstract class AirShipController extends Quest } } - protected final class DepartTask implements Runnable + final class DepartTask implements Runnable { @Override public void run() @@ -73,14 +73,14 @@ public abstract class AirShipController extends Quest } } - public static final Logger _log = Logger.getLogger(AirShipController.class.getName()); + private static final Logger _log = Logger.getLogger(AirShipController.class.getName()); protected int _dockZone = 0; protected int _shipSpawnX = 0; protected int _shipSpawnY = 0; protected int _shipSpawnZ = 0; - protected int _shipHeading = 0; + private final int _shipHeading = 0; protected Location _oustLoc = null; protected int _locationId = 0; @@ -93,8 +93,8 @@ public abstract class AirShipController extends Quest protected int _movieId = 0; - protected boolean _isBusy = false; - protected L2ControllableAirShipInstance _dockedShip = null; + private boolean _isBusy = false; + L2ControllableAirShipInstance _dockedShip = null; private final Runnable _decayTask = new DecayTask(); private final Runnable _departTask = new DepartTask(); diff --git a/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java b/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java index 59d5a76d06..91486a89f9 100644 --- a/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java +++ b/trunk/dist/game/data/scripts/handlers/EffectMasterHandler.java @@ -28,7 +28,7 @@ import handlers.effecthandlers.*; * Effect Master handler. * @author BiggBoss, Zoey76 */ -public final class EffectMasterHandler +final class EffectMasterHandler { private static final Logger _log = Logger.getLogger(EffectMasterHandler.class.getName()); diff --git a/trunk/dist/game/data/scripts/handlers/MasterHandler.java b/trunk/dist/game/data/scripts/handlers/MasterHandler.java index cbd3506671..f3a2b97f90 100644 --- a/trunk/dist/game/data/scripts/handlers/MasterHandler.java +++ b/trunk/dist/game/data/scripts/handlers/MasterHandler.java @@ -285,7 +285,7 @@ import handlers.voicedcommandhandlers.Wedding; * Master handler. * @author UnAfraid */ -public class MasterHandler +final class MasterHandler { private static final Logger _log = Logger.getLogger(MasterHandler.class.getName()); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java index 69f51cceb4..b79e9c6129 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminAdmin.java @@ -438,7 +438,7 @@ public class AdminAdmin implements IAdminCommandHandler AdminHtml.showAdminHtml(activeChar, filename + "_menu.htm"); } - public void showConfigPage(L2PcInstance activeChar) + private void showConfigPage(L2PcInstance activeChar) { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); final StringBuilder replyMSG = new StringBuilder("L2J :: Config"); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java index 75c020212c..078be616c1 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminBuffs.java @@ -213,7 +213,7 @@ public class AdminBuffs implements IAdminCommandHandler * @param gmchar the player to switch the Game Master skills. * @param toAuraSkills if {@code true} it will remove "GM Aura" skills and add "GM regular" skills, vice versa if {@code false}. */ - public static void switchSkills(L2PcInstance gmchar, boolean toAuraSkills) + private static void switchSkills(L2PcInstance gmchar, boolean toAuraSkills) { final Collection skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree().values() : SkillTreesData.getInstance().getGMAuraSkillTree().values(); for (Skill skill : skills) @@ -229,7 +229,7 @@ public class AdminBuffs implements IAdminCommandHandler return ADMIN_COMMANDS; } - public static void showBuffs(L2PcInstance activeChar, L2Character target, int page, boolean passive) + private static void showBuffs(L2PcInstance activeChar, L2Character target, int page, boolean passive) { final List effects = new ArrayList<>(); if (!passive) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java index 8f78edf82f..6049277935 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminEventEngine.java @@ -465,7 +465,7 @@ public class AdminEventEngine implements IAdminCommandHandler return note + result.toString(); } - public void showMainPage(L2PcInstance activeChar) + private void showMainPage(L2PcInstance activeChar) { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); @@ -474,7 +474,7 @@ public class AdminEventEngine implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - public void showNewEventPage(L2PcInstance activeChar) + private void showNewEventPage(L2PcInstance activeChar) { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); @@ -515,7 +515,7 @@ public class AdminEventEngine implements IAdminCommandHandler activeChar.sendPacket(adminReply); } - public void showEventParameters(L2PcInstance activeChar, int teamnumbers) + private void showEventParameters(L2PcInstance activeChar, int teamnumbers) { final NpcHtmlMessage adminReply = new NpcHtmlMessage(); final StringBuilder sb = new StringBuilder(); diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java index b4c15e69c4..eb0256f8ec 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminHtml.java @@ -76,7 +76,7 @@ public class AdminHtml implements IAdminCommandHandler * @param activeChar activeChar where html is shown * @param path relative path from directory html/admin/ to html */ - public static void showAdminHtml(L2PcInstance activeChar, String path) + static void showAdminHtml(L2PcInstance activeChar, String path) { showHtml(activeChar, "html/admin/" + path, false); } @@ -87,7 +87,7 @@ public class AdminHtml implements IAdminCommandHandler * @param path relative path from Config.DATAPACK_ROOT to html. * @param reload {@code true} will reload html and show it {@code false} will show it from cache. */ - public static void showHtml(L2PcInstance activeChar, String path, boolean reload) + private static void showHtml(L2PcInstance activeChar, String path, boolean reload) { String content = null; if (!reload) diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java index 244e5b1858..dc9bb8e61c 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminMonsterRace.java @@ -38,8 +38,7 @@ public class AdminMonsterRace implements IAdminCommandHandler { "admin_mons" }; - - protected static int state = -1; + static int state = -1; @Override public boolean useAdminCommand(String command, L2PcInstance activeChar) @@ -113,12 +112,12 @@ public class AdminMonsterRace implements IAdminCommandHandler } } - class RunRace implements Runnable + private class RunRace implements Runnable { private final int[][] codes; private final L2PcInstance activeChar; - public RunRace(int[][] pCodes, L2PcInstance pActiveChar) + RunRace(int[][] pCodes, L2PcInstance pActiveChar) { codes = pCodes; activeChar = pActiveChar; diff --git a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java index a69174cc2a..30bbf42acc 100644 --- a/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java +++ b/trunk/dist/game/data/scripts/handlers/admincommandhandlers/AdminSummon.java @@ -30,7 +30,7 @@ public class AdminSummon implements IAdminCommandHandler { private static final Logger _log = Logger.getLogger(AdminSummon.class.getName()); - public static final String[] ADMIN_COMMANDS = + private static final String[] ADMIN_COMMANDS = { "admin_summon" }; diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java index 1d3fa2cd01..8ec475617c 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/Loto.java @@ -90,7 +90,7 @@ public class Loto implements IBypassHandler // 23 - current lottery jackpot // 24 - Previous winning numbers/Prize claim // >24 - check lottery ticket by item object id - public static final void showLotoWindow(L2PcInstance player, L2Npc npc, int val) + private static final void showLotoWindow(L2PcInstance player, L2Npc npc, int val) { final int npcId = npc.getTemplate().getId(); String filename; diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java index 061f8ff106..61a4f4a31e 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/NpcViewMod.java @@ -214,7 +214,7 @@ public class NpcViewMod implements IBypassHandler activeChar.sendPacket(html); } - public static String getDropListButtons(L2Npc npc) + private static String getDropListButtons(L2Npc npc) { final StringBuilder sb = new StringBuilder(); final Map> dropLists = npc.getTemplate().getDropLists(); @@ -235,7 +235,7 @@ public class NpcViewMod implements IBypassHandler return sb.toString(); } - public static void sendNpcDropList(L2PcInstance activeChar, L2Npc npc, DropListScope dropListScope, int page) + private static void sendNpcDropList(L2PcInstance activeChar, L2Npc npc, DropListScope dropListScope, int page) { final List dropList = npc.getTemplate().getDropList(dropListScope); if ((dropList == null) || dropList.isEmpty()) diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java index 91b215a4fe..320e273a4d 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java @@ -202,7 +202,7 @@ public class QuestLink implements IBypassHandler * @param npc the L2NpcInstance that chats with the {@code player} * @param questId the Id of the quest to display the message */ - public static void showQuestWindow(L2PcInstance player, L2Npc npc, String questId) + private static void showQuestWindow(L2PcInstance player, L2Npc npc, String questId) { String content = null; diff --git a/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java b/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java index d9fec11c12..c81dcc0547 100644 --- a/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java +++ b/trunk/dist/game/data/scripts/handlers/bypasshandlers/RentPet.java @@ -78,7 +78,7 @@ public class RentPet implements IBypassHandler return false; } - public static final void tryRentPet(L2PcInstance player, int val) + private static final void tryRentPet(L2PcInstance player, int val) { if ((player == null) || player.hasSummon() || player.isMounted() || player.isRentedPet() || player.isTransformed() || player.isCursedWeaponEquipped()) { diff --git a/trunk/dist/game/data/scripts/handlers/chathandlers/ChatRandomizer.java b/trunk/dist/game/data/scripts/handlers/chathandlers/ChatRandomizer.java index 62a35ac0e7..c57695a503 100644 --- a/trunk/dist/game/data/scripts/handlers/chathandlers/ChatRandomizer.java +++ b/trunk/dist/game/data/scripts/handlers/chathandlers/ChatRandomizer.java @@ -21,9 +21,9 @@ import com.l2jmobius.util.Rnd; /** * @author Mobius */ -public class ChatRandomizer +class ChatRandomizer { - public static String randomize(String text) + static String randomize(String text) { final StringBuilder textOut = new StringBuilder(); for (char c : text.toCharArray()) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockDamage.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockDamage.java index e982c9e796..188c802909 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockDamage.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/BlockDamage.java @@ -27,7 +27,7 @@ import com.l2jmobius.gameserver.model.effects.L2EffectType; */ public final class BlockDamage extends AbstractEffect { - public enum BlockType + private enum BlockType { HP, MP diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 0715dfc4e0..ac1a2fecd5 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -53,7 +53,7 @@ public final class SoulEating extends AbstractEffect } } - public void onExperienceReceived(L2Playable playable, long exp) + private void onExperienceReceived(L2Playable playable, long exp) { // TODO: Verify logic. if (playable.isPlayer() && (exp >= _expNeeded)) diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index baa0bba0ad..7f7277ca56 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -56,7 +56,6 @@ public final class TriggerSkillByAttack extends AbstractEffect * @param set * @param params */ - public TriggerSkillByAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) { super(attachCond, applyCond, set, params); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index ec436291eb..f84efd4dc9 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -48,7 +48,6 @@ public final class TriggerSkillByAvoid extends AbstractEffect * @param set * @param params */ - public TriggerSkillByAvoid(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) { super(attachCond, applyCond, set, params); diff --git a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 1448d5879b..5fdb013384 100644 --- a/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/trunk/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -50,7 +50,6 @@ public final class TriggerSkillBySkill extends AbstractEffect * @param set * @param params */ - public TriggerSkillBySkill(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params) { super(attachCond, applyCond, set, params); diff --git a/trunk/dist/game/data/scripts/handlers/itemhandlers/PetFood.java b/trunk/dist/game/data/scripts/handlers/itemhandlers/PetFood.java index 851e32f45d..faa4bc4f3a 100644 --- a/trunk/dist/game/data/scripts/handlers/itemhandlers/PetFood.java +++ b/trunk/dist/game/data/scripts/handlers/itemhandlers/PetFood.java @@ -57,7 +57,7 @@ public class PetFood implements IItemHandler return true; } - public boolean useFood(L2Playable activeChar, int skillId, int skillLevel, L2ItemInstance item) + private boolean useFood(L2Playable activeChar, int skillId, int skillLevel, L2ItemInstance item) { final Skill skill = SkillData.getInstance().getSkill(skillId, skillLevel); if (skill != null) diff --git a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java index 9b862dc24f..db3e734bcc 100644 --- a/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java +++ b/trunk/dist/game/data/scripts/handlers/punishmenthandlers/JailHandler.java @@ -48,7 +48,7 @@ public class JailHandler implements IPunishmentHandler Containers.Global().addListener(new ConsumerEventListener(Containers.Global(), EventType.ON_PLAYER_LOGIN, (OnPlayerLogin event) -> onPlayerLogin(event), this)); } - public void onPlayerLogin(OnPlayerLogin event) + private void onPlayerLogin(OnPlayerLogin event) { final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isJailed() && !activeChar.isInsideZone(ZoneId.JAIL)) diff --git a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java index eb3d6a0e03..2fea2f790b 100644 --- a/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java +++ b/trunk/dist/game/data/scripts/handlers/targethandlers/AreaFriendly.java @@ -149,7 +149,7 @@ public class AreaFriendly implements ITargetTypeHandler return true; } - public class CharComparator implements Comparator + class CharComparator implements Comparator { @Override public int compare(L2Character char1, L2Character char2) diff --git a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java index abd6f2f99c..715a02dd5b 100644 --- a/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java +++ b/trunk/dist/game/data/scripts/handlers/usercommandhandlers/ExperienceGain.java @@ -59,7 +59,7 @@ public final class ExperienceGain implements IVoicedCommandHandler return true; } - public TerminateReturn onExperienceReceived(L2Playable playable, long exp) + private TerminateReturn onExperienceReceived(L2Playable playable, long exp) { if (playable.isPlayer() && (playable.getActingPlayer().isDead())) { diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java index 46612781b8..8d9af8535c 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/CastleVCmd.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.network.SystemMessageId; /** * @author Zoey76 */ -public class CastleVCmd implements IVoicedCommandHandler +final class CastleVCmd implements IVoicedCommandHandler { private static final String[] VOICED_COMMANDS = { diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java index 6840af8c4b..a806b4b602 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/SetVCmd.java @@ -24,7 +24,7 @@ import com.l2jmobius.gameserver.util.Util; /** * @author Zoey76 */ -public class SetVCmd implements IVoicedCommandHandler +class SetVCmd implements IVoicedCommandHandler { private static final String[] VOICED_COMMANDS = { diff --git a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java index e6bd238de2..cb4cd887fc 100644 --- a/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java +++ b/trunk/dist/game/data/scripts/handlers/voicedcommandhandlers/Wedding.java @@ -83,7 +83,7 @@ public class Wedding implements IVoicedCommandHandler return false; } - public boolean divorce(L2PcInstance activeChar) + private boolean divorce(L2PcInstance activeChar) { if (activeChar.getPartnerId() == 0) { @@ -129,7 +129,7 @@ public class Wedding implements IVoicedCommandHandler return true; } - public boolean engage(L2PcInstance activeChar) + private boolean engage(L2PcInstance activeChar) { if (activeChar.getTarget() == null) { @@ -243,7 +243,7 @@ public class Wedding implements IVoicedCommandHandler return true; } - public boolean goToLove(L2PcInstance activeChar) + private boolean goToLove(L2PcInstance activeChar) { if (!activeChar.isMarried()) { @@ -426,7 +426,7 @@ public class Wedding implements IVoicedCommandHandler return true; } - static class EscapeFinalizer implements Runnable + private static class EscapeFinalizer implements Runnable { private final L2PcInstance _activeChar; private final Location _partnerLoc; diff --git a/trunk/dist/game/data/scripts/instances/AbstractInstance.java b/trunk/dist/game/data/scripts/instances/AbstractInstance.java index 5bb8ff2fa0..3d291ebaf6 100644 --- a/trunk/dist/game/data/scripts/instances/AbstractInstance.java +++ b/trunk/dist/game/data/scripts/instances/AbstractInstance.java @@ -103,7 +103,7 @@ public abstract class AbstractInstance extends AbstractNpcAI finishInstance(world, Config.INSTANCE_FINISH_TIME); } - protected void finishInstance(InstanceWorld world, int duration) + private void finishInstance(InstanceWorld world, int duration) { final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); @@ -173,7 +173,7 @@ public abstract class AbstractInstance extends AbstractNpcAI } } - protected void handleRemoveBuffs(InstanceWorld world) + private void handleRemoveBuffs(InstanceWorld world) { for (int objId : world.getAllowed()) { @@ -214,7 +214,7 @@ public abstract class AbstractInstance extends AbstractNpcAI * @param world the instance * @param time the time in milliseconds */ - protected void setReenterTime(InstanceWorld world, long time) + private void setReenterTime(InstanceWorld world, long time) { for (int objectId : world.getAllowed()) { diff --git a/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java b/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java index 9c8d2382e7..926e5caf6c 100644 --- a/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java +++ b/trunk/dist/game/data/scripts/instances/CavernOfThePirateCaptain/CavernOfThePirateCaptain.java @@ -39,14 +39,14 @@ import instances.AbstractInstance; */ public final class CavernOfThePirateCaptain extends AbstractInstance { - protected class CavernOfThePirateCaptainWorld extends InstanceWorld + class CavernOfThePirateCaptainWorld extends InstanceWorld { - protected List playersInside = new ArrayList<>(); - protected L2Attackable _zaken; - protected long storeTime = 0; - protected boolean _is83; - protected int _zakenRoom; - protected int _blueFounded; + final List playersInside = new ArrayList<>(); + L2Attackable _zaken; + long storeTime = 0; + boolean _is83; + int _zakenRoom; + int _blueFounded; } // NPCs diff --git a/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java b/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java index f536238eae..a794dda72a 100644 --- a/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java +++ b/trunk/dist/game/data/scripts/instances/ChambersOfDelusion/Chamber.java @@ -49,28 +49,28 @@ import instances.AbstractInstance; * Chambers of Delusion superclass. * @author GKR */ -public abstract class Chamber extends AbstractInstance +abstract class Chamber extends AbstractInstance { - protected class CDWorld extends InstanceWorld + private class CDWorld extends InstanceWorld { - protected int currentRoom; - protected final L2Party partyInside; - protected final ScheduledFuture _banishTask; - protected ScheduledFuture _roomChangeTask; + int currentRoom; + final L2Party partyInside; + final ScheduledFuture _banishTask; + private ScheduledFuture _roomChangeTask; - protected CDWorld(L2Party party) + CDWorld(L2Party party) { currentRoom = 0; partyInside = party; _banishTask = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new BanishTask(), 60000, 60000); } - protected L2Party getPartyInside() + L2Party getPartyInside() { return partyInside; } - protected void scheduleRoomChange(boolean bossRoom) + void scheduleRoomChange(boolean bossRoom) { final Instance inst = InstanceManager.getInstance().getInstance(getInstanceId()); final long nextInterval = bossRoom ? 60000L : (ROOM_CHANGE_INTERVAL + getRandom(ROOM_CHANGE_RANDOM_TIME)) * 1000L; @@ -82,17 +82,17 @@ public abstract class Chamber extends AbstractInstance } } - protected void stopBanishTask() + void stopBanishTask() { _banishTask.cancel(true); } - protected void stopRoomChangeTask() + void stopRoomChangeTask() { _roomChangeTask.cancel(true); } - protected class BanishTask implements Runnable + class BanishTask implements Runnable { @Override public void run() @@ -120,7 +120,7 @@ public abstract class Chamber extends AbstractInstance } } - protected class ChangeRoomTask implements Runnable + class ChangeRoomTask implements Runnable { @Override public void run() @@ -285,7 +285,7 @@ public abstract class Chamber extends AbstractInstance } } - protected void changeRoom(CDWorld world) + void changeRoom(CDWorld world) { final L2Party party = world.getPartyInside(); final Instance inst = InstanceManager.getInstance().getInstance(world.getInstanceId()); @@ -297,7 +297,7 @@ public abstract class Chamber extends AbstractInstance int newRoom = world.currentRoom; - // Do nothing, if there are raid room of Sqare or Tower Chamber + // Do nothing, if there are raid room of Square or Tower Chamber if (isBigChamber() && isBossRoom(world)) { return; @@ -384,7 +384,7 @@ public abstract class Chamber extends AbstractInstance changeRoom(world); } - protected void earthQuake(CDWorld world) + void earthQuake(CDWorld world) { final L2Party party = world.getPartyInside(); @@ -416,7 +416,7 @@ public abstract class Chamber extends AbstractInstance } } - protected void exitInstance(L2PcInstance player) + void exitInstance(L2PcInstance player) { if ((player == null) || !player.isOnline() || (player.getInstanceId() == 0)) { diff --git a/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java index 85116c1f63..87080c9ee2 100644 --- a/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java +++ b/trunk/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java @@ -73,11 +73,11 @@ import instances.AbstractInstance; */ public final class CrystalCaverns extends AbstractInstance { - protected static class CrystalGolem + static class CrystalGolem { - protected L2ItemInstance foodItem = null; - protected boolean isAtDestination = false; - protected Location oldLoc = null; + L2ItemInstance foodItem = null; + boolean isAtDestination = false; + Location oldLoc = null; } private class CCWorld extends InstanceWorld @@ -719,7 +719,7 @@ public final class CrystalCaverns extends AbstractInstance } } - protected void stopAttack(L2PcInstance player) + private void stopAttack(L2PcInstance player) { player.setTarget(null); player.abortAttack(); @@ -748,21 +748,21 @@ public final class CrystalCaverns extends AbstractInstance }); } - protected void runOracle(CCWorld world) + private void runOracle(CCWorld world) { world.setStatus(0); world.oracle.add(addSpawn(ORACLE_GUIDE_1, 143172, 148894, -11975, 0, false, 0, false, world.getInstanceId())); } - protected void runEmerald(CCWorld world) + private void runEmerald(CCWorld world) { world.setStatus(1); runFirst(world); openDoor(DOOR1, world.getInstanceId()); } - protected void runCoral(CCWorld world) + private void runCoral(CCWorld world) { world.setStatus(1); runHall(world); @@ -770,7 +770,7 @@ public final class CrystalCaverns extends AbstractInstance openDoor(DOOR5, world.getInstanceId()); } - protected void runHall(CCWorld world) + private void runHall(CCWorld world) { world.setStatus(2); @@ -781,7 +781,7 @@ public final class CrystalCaverns extends AbstractInstance } } - protected void runFirst(CCWorld world) + private void runFirst(CCWorld world) { world.setStatus(2); @@ -794,7 +794,7 @@ public final class CrystalCaverns extends AbstractInstance } } - protected void runEmeraldSquare(CCWorld world) + private void runEmeraldSquare(CCWorld world) { world.setStatus(3); @@ -807,7 +807,7 @@ public final class CrystalCaverns extends AbstractInstance world.npcList2.put(0, spawnList); } - protected void runEmeraldRooms(CCWorld world, int[][] spawnList, int room) + private void runEmeraldRooms(CCWorld world, int[][] spawnList, int room) { final Map spawned = new HashMap<>(); for (int[] spawn : spawnList) @@ -823,7 +823,7 @@ public final class CrystalCaverns extends AbstractInstance world.roomsStatus[room - 1] = 1; } - protected void runDarnel(CCWorld world) + private void runDarnel(CCWorld world) { world.setStatus(9); @@ -833,7 +833,7 @@ public final class CrystalCaverns extends AbstractInstance openDoor(24220006, world.getInstanceId()); } - protected void runSteamRooms(CCWorld world, int[][] spawnList, int status) + private void runSteamRooms(CCWorld world, int[][] spawnList, int status) { world.setStatus(status); @@ -846,7 +846,7 @@ public final class CrystalCaverns extends AbstractInstance world.npcList2.put(0, spawned); } - protected void runSteamOracles(CCWorld world, int[][] oracleOrder) + private void runSteamOracles(CCWorld world, int[][] oracleOrder) { world.oracles.clear(); for (int[] oracle : oracleOrder) @@ -855,7 +855,7 @@ public final class CrystalCaverns extends AbstractInstance } } - protected boolean checkKillProgress(int room, L2Npc mob, CCWorld world) + private boolean checkKillProgress(int room, L2Npc mob, CCWorld world) { if (world.npcList2.get(room).containsKey(mob)) { diff --git a/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java b/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java index 70a807397c..e6742436eb 100644 --- a/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java +++ b/trunk/dist/game/data/scripts/instances/DarkCloudMansion/DarkCloudMansion.java @@ -43,9 +43,9 @@ import instances.AbstractInstance; */ public final class DarkCloudMansion extends AbstractInstance { - protected class DMCWorld extends InstanceWorld + class DMCWorld extends InstanceWorld { - protected Map rooms = new ConcurrentHashMap<>(); + final Map rooms = new ConcurrentHashMap<>(); } // NPCs @@ -216,23 +216,23 @@ public final class DarkCloudMansion extends AbstractInstance addKillId(TOKILL); } - protected static class DMCNpc + static class DMCNpc { - public L2Npc npc; - public boolean isDead = false; - public L2Npc golem = null; - public int status = 0; - public int order = 0; - public int count = 0; + L2Npc npc; + boolean isDead = false; + L2Npc golem = null; + int status = 0; + int order = 0; + int count = 0; } - protected static class DMCRoom + static class DMCRoom { - public List npcList = new ArrayList<>(); - public int counter = 0; - public int reset = 0; - public int founded = 0; - public int[] Order; + final List npcList = new ArrayList<>(); + int counter = 0; + int reset = 0; + int founded = 0; + int[] Order; } @Override @@ -298,7 +298,7 @@ public final class DarkCloudMansion extends AbstractInstance } } - protected void runStartRoom(DMCWorld world) + private void runStartRoom(DMCWorld world) { world.setStatus(0); final DMCRoom StartRoom = new DMCRoom(); @@ -322,7 +322,7 @@ public final class DarkCloudMansion extends AbstractInstance world.rooms.put("StartRoom", StartRoom); } - protected void spawnHall(DMCWorld world) + private void spawnHall(DMCWorld world) { final DMCRoom Hall = new DMCRoom(); DMCNpc thisnpc; @@ -395,14 +395,14 @@ public final class DarkCloudMansion extends AbstractInstance world.rooms.put("Hall", Hall); } - protected void runHall(DMCWorld world) + private void runHall(DMCWorld world) { spawnHall(world); world.setStatus(1); openDoor(D1, world.getInstanceId()); } - protected void runFirstRoom(DMCWorld world) + private void runFirstRoom(DMCWorld world) { final DMCRoom FirstRoom = new DMCRoom(); DMCNpc thisnpc; @@ -444,14 +444,14 @@ public final class DarkCloudMansion extends AbstractInstance openDoor(D2, world.getInstanceId()); } - protected void runHall2(DMCWorld world) + private void runHall2(DMCWorld world) { addSpawn(SOFaith, 147818, 179643, -6117, 0, false, 0, false, world.getInstanceId()); spawnHall(world); world.setStatus(3); } - protected void runSecondRoom(DMCWorld world) + private void runSecondRoom(DMCWorld world) { final DMCRoom SecondRoom = new DMCRoom(); DMCNpc thisnpc; @@ -501,14 +501,14 @@ public final class DarkCloudMansion extends AbstractInstance openDoor(D3, world.getInstanceId()); } - protected void runHall3(DMCWorld world) + private void runHall3(DMCWorld world) { addSpawn(SOAdversity, 147808, 181281, -6117, 16383, false, 0, false, world.getInstanceId()); spawnHall(world); world.setStatus(5); } - protected void runThirdRoom(DMCWorld world) + private void runThirdRoom(DMCWorld world) { final DMCRoom ThirdRoom = new DMCRoom(); final DMCNpc thisnpc = new DMCNpc(); @@ -554,7 +554,7 @@ public final class DarkCloudMansion extends AbstractInstance openDoor(D4, world.getInstanceId()); } - protected void runThirdRoom2(DMCWorld world) + private void runThirdRoom2(DMCWorld world) { addSpawn(SOAdventure, 148910, 178397, -6117, 16383, false, 0, false, world.getInstanceId()); final DMCRoom ThirdRoom = new DMCRoom(); @@ -600,7 +600,7 @@ public final class DarkCloudMansion extends AbstractInstance world.setStatus(8); } - protected void runForthRoom(DMCWorld world) + private void runForthRoom(DMCWorld world) { final DMCRoom ForthRoom = new DMCRoom(); ForthRoom.counter = 0; @@ -647,7 +647,7 @@ public final class DarkCloudMansion extends AbstractInstance openDoor(D5, world.getInstanceId()); } - protected void runFifthRoom(DMCWorld world) + private void runFifthRoom(DMCWorld world) { spawnFifthRoom(world); world.setStatus(9); @@ -689,7 +689,7 @@ public final class DarkCloudMansion extends AbstractInstance world.rooms.put("FifthRoom", FifthRoom); } - protected boolean checkKillProgress(L2Npc npc, DMCRoom room) + private boolean checkKillProgress(L2Npc npc, DMCRoom room) { boolean cont = true; for (DMCNpc npcobj : room.npcList) @@ -707,7 +707,7 @@ public final class DarkCloudMansion extends AbstractInstance return cont; } - protected void spawnRndGolem(DMCWorld world, DMCNpc npc) + private void spawnRndGolem(DMCWorld world, DMCNpc npc) { if (npc.golem != null) { @@ -726,7 +726,7 @@ public final class DarkCloudMansion extends AbstractInstance } } - protected void checkStone(L2Npc npc, int order[], DMCNpc npcObj, DMCWorld world) + private void checkStone(L2Npc npc, int order[], DMCNpc npcObj, DMCWorld world) { for (int i = 1; i < 7; i++) { @@ -747,14 +747,14 @@ public final class DarkCloudMansion extends AbstractInstance spawnRndGolem(world, npcObj); } - protected void endInstance(DMCWorld world) + private void endInstance(DMCWorld world) { world.setStatus(10); addSpawn(SOTruth, 148911, 181940, -6117, 16383, false, 0, false, world.getInstanceId()); world.rooms.clear(); } - protected void checkBelethSample(DMCWorld world, L2Npc npc, L2PcInstance player) + private void checkBelethSample(DMCWorld world, L2Npc npc, L2PcInstance player) { final DMCRoom FifthRoom = world.rooms.get("FifthRoom"); @@ -787,7 +787,7 @@ public final class DarkCloudMansion extends AbstractInstance } } - protected void killedBelethSample(DMCWorld world, L2Npc npc) + private void killedBelethSample(DMCWorld world, L2Npc npc) { int decayedSamples = 0; final DMCRoom FifthRoom = world.rooms.get("FifthRoom"); @@ -837,7 +837,7 @@ public final class DarkCloudMansion extends AbstractInstance } } - protected boolean allStonesDone(DMCWorld world) + private boolean allStonesDone(DMCWorld world) { final DMCRoom SecondRoom = world.rooms.get("SecondRoom"); @@ -853,7 +853,7 @@ public final class DarkCloudMansion extends AbstractInstance return true; } - protected void removeMonoliths(DMCWorld world) + private void removeMonoliths(DMCWorld world) { final DMCRoom SecondRoom = world.rooms.get("SecondRoom"); @@ -863,7 +863,7 @@ public final class DarkCloudMansion extends AbstractInstance } } - protected void chkShadowColumn(DMCWorld world, L2Npc npc) + private void chkShadowColumn(DMCWorld world, L2Npc npc) { final DMCRoom ForthRoom = world.rooms.get("ForthRoom"); diff --git a/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java b/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java index ee39ecc500..43decee338 100644 --- a/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java +++ b/trunk/dist/game/data/scripts/instances/DisciplesNecropolisPast/DisciplesNecropolisPast.java @@ -43,11 +43,11 @@ import quests.Q00196_SevenSignsSealOfTheEmperor.Q00196_SevenSignsSealOfTheEmpero */ public final class DisciplesNecropolisPast extends AbstractInstance { - protected class DNPWorld extends InstanceWorld + class DNPWorld extends InstanceWorld { - protected final List anakimGroup = new ArrayList<>(); - protected final List lilithGroup = new ArrayList<>(); - protected int countKill = 0; + final List anakimGroup = new ArrayList<>(); + final List lilithGroup = new ArrayList<>(); + int countKill = 0; } // NPCs @@ -132,7 +132,7 @@ public final class DisciplesNecropolisPast extends AbstractInstance addTalkId(PROMISE_OF_MAMMON, SHUNAIMAN, LEON, DISCIPLES_GATEKEEPER); } - protected void spawnNPC(DNPWorld world) + private void spawnNPC(DNPWorld world) { for (Map.Entry entry : LILITH_SPAWN.entrySet()) { diff --git a/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java b/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java index 9fc794b1ec..0fe476048f 100644 --- a/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java +++ b/trunk/dist/game/data/scripts/instances/ElcadiasTent/ElcadiasTent.java @@ -35,7 +35,7 @@ import quests.Q10296_SevenSignsPowerOfTheSeal.Q10296_SevenSignsPowerOfTheSeal; */ public final class ElcadiasTent extends AbstractInstance { - protected class ETWorld extends InstanceWorld + class ETWorld extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java b/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java index 9df611627a..e91571fef9 100644 --- a/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java +++ b/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds1/FaeronTrainingGrounds1.java @@ -34,7 +34,7 @@ import quests.Q10735_ASpecialPower.Q10735_ASpecialPower; */ public final class FaeronTrainingGrounds1 extends AbstractInstance { - // NPC's + // NPCs private static final int AYANTHE = 33942; private static final int AYANTHE_2 = 33944; // Locations @@ -43,7 +43,7 @@ public final class FaeronTrainingGrounds1 extends AbstractInstance // Misc private static final int TEMPLATE_ID = 251; - protected class FTGWorld extends InstanceWorld + class FTGWorld extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java b/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java index 10a44cb4c3..3d4cea2606 100644 --- a/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java +++ b/trunk/dist/game/data/scripts/instances/FaeronTrainingGrounds2/FaeronTrainingGrounds2.java @@ -43,7 +43,7 @@ public final class FaeronTrainingGrounds2 extends AbstractInstance // Misc private static final int TEMPLATE_ID = 252; - protected class FTGWorld extends InstanceWorld + class FTGWorld extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java index f1877264cd..f5ad9ee919 100644 --- a/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java +++ b/trunk/dist/game/data/scripts/instances/FinalEmperialTomb/FinalEmperialTomb.java @@ -81,42 +81,42 @@ import instances.AbstractInstance; */ public final class FinalEmperialTomb extends AbstractInstance { - protected class FETWorld extends InstanceWorld + class FETWorld extends InstanceWorld { - protected Lock lock = new ReentrantLock(); - protected List npcList = new CopyOnWriteArrayList<>(); - protected int darkChoirPlayerCount = 0; - protected FrintezzaSong OnSong = null; - protected ScheduledFuture songTask = null; - protected ScheduledFuture songEffectTask = null; - protected boolean isVideo = false; - protected L2Npc frintezzaDummy = null; - protected L2Npc overheadDummy = null; - protected L2Npc portraitDummy1 = null; - protected L2Npc portraitDummy3 = null; - protected L2Npc scarletDummy = null; - protected L2GrandBossInstance frintezza = null; - protected L2GrandBossInstance activeScarlet = null; - protected List demons = new CopyOnWriteArrayList<>(); - protected Map portraits = new ConcurrentHashMap<>(); - protected int scarlet_x = 0; - protected int scarlet_y = 0; - protected int scarlet_z = 0; - protected int scarlet_h = 0; - protected int scarlet_a = 0; + final Lock lock = new ReentrantLock(); + final List npcList = new CopyOnWriteArrayList<>(); + int darkChoirPlayerCount = 0; + FrintezzaSong OnSong = null; + ScheduledFuture songTask = null; + ScheduledFuture songEffectTask = null; + boolean isVideo = false; + L2Npc frintezzaDummy = null; + L2Npc overheadDummy = null; + L2Npc portraitDummy1 = null; + L2Npc portraitDummy3 = null; + L2Npc scarletDummy = null; + L2GrandBossInstance frintezza = null; + L2GrandBossInstance activeScarlet = null; + final List demons = new CopyOnWriteArrayList<>(); + final Map portraits = new ConcurrentHashMap<>(); + int scarlet_x = 0; + int scarlet_y = 0; + int scarlet_z = 0; + int scarlet_h = 0; + int scarlet_a = 0; } - protected static class FETSpawn + static class FETSpawn { - public boolean isZone = false; - public boolean isNeededNextFlag = false; - public int npcId; - public int x = 0; - public int y = 0; - public int z = 0; - public int h = 0; - public int zone = 0; - public int count = 0; + boolean isZone = false; + boolean isNeededNextFlag = false; + int npcId; + int x = 0; + int y = 0; + int z = 0; + int h = 0; + int zone = 0; + int count = 0; } private static class FrintezzaSong @@ -166,10 +166,9 @@ public final class FinalEmperialTomb extends AbstractInstance // Skills private static final int DEWDROP_OF_DESTRUCTION_SKILL_ID = 2276; private static final int SOUL_BREAKING_ARROW_SKILL_ID = 2234; - protected static final SkillHolder INTRO_SKILL = new SkillHolder(5004, 1); + static final SkillHolder INTRO_SKILL = new SkillHolder(5004, 1); private static final SkillHolder FIRST_MORPH_SKILL = new SkillHolder(5017, 1); - - protected static final FrintezzaSong[] FRINTEZZASONGLIST = + static final FrintezzaSong[] FRINTEZZASONGLIST = { new FrintezzaSong(new SkillHolder(5007, 1), new SkillHolder(5008, 1), NpcStringId.REQUIEM_OF_HATRED, 5), new FrintezzaSong(new SkillHolder(5007, 2), new SkillHolder(5008, 2), NpcStringId.RONDO_OF_SOLITUDE, 50), @@ -179,7 +178,7 @@ public final class FinalEmperialTomb extends AbstractInstance }; // Locations private static final Location ENTER_TELEPORT = new Location(-88015, -141153, -9168); - protected static final Location MOVE_TO_CENTER = new Location(-87904, -141296, -9168, 0); + static final Location MOVE_TO_CENTER = new Location(-87904, -141296, -9168, 0); // Misc private static final int TEMPLATE_ID = 136; // this is the client number private static final int MIN_PLAYERS = 36; @@ -190,7 +189,7 @@ public final class FinalEmperialTomb extends AbstractInstance private final Map _spawnZoneList = new HashMap<>(); private final Map> _spawnList = new HashMap<>(); private final List _mustKillMobsId = new ArrayList<>(); - protected static final int[] FIRST_ROOM_DOORS = + static final int[] FIRST_ROOM_DOORS = { 17130051, 17130052, @@ -201,7 +200,7 @@ public final class FinalEmperialTomb extends AbstractInstance 17130057, 17130058 }; - protected static final int[] SECOND_ROOM_DOORS = + static final int[] SECOND_ROOM_DOORS = { 17130061, 17130062, @@ -214,18 +213,18 @@ public final class FinalEmperialTomb extends AbstractInstance 17130069, 17130070 }; - protected static final int[] FIRST_ROUTE_DOORS = + static final int[] FIRST_ROUTE_DOORS = { 17130042, 17130043 }; - protected static final int[] SECOND_ROUTE_DOORS = + static final int[] SECOND_ROUTE_DOORS = { 17130045, 17130046 }; // @formatter:off - protected static final int[][] PORTRAIT_SPAWNS = + static final int[][] PORTRAIT_SPAWNS = { {29048, -89381, -153981, -9168, 3368, -89378, -153968, -9168, 3368}, {29048, -86234, -152467, -9168, 37656, -86261, -152492, -9168, 37656}, @@ -560,7 +559,7 @@ public final class FinalEmperialTomb extends AbstractInstance } } - protected boolean checkKillProgress(L2Npc mob, FETWorld world) + private boolean checkKillProgress(L2Npc mob, FETWorld world) { if (world.npcList.contains(mob)) { @@ -608,7 +607,7 @@ public final class FinalEmperialTomb extends AbstractInstance } } - protected boolean controlStatus(FETWorld world) + boolean controlStatus(FETWorld world) { if (world.lock.tryLock()) { @@ -724,7 +723,7 @@ public final class FinalEmperialTomb extends AbstractInstance return false; } - protected void spawn(FETWorld world, int npcId, int x, int y, int z, int h, boolean addToKillTable) + private void spawn(FETWorld world, int npcId, int x, int y, int z, int h, boolean addToKillTable) { final L2Npc npc = addSpawn(npcId, x, y, z, h, false, 0, false, world.getInstanceId()); if (addToKillTable) @@ -1431,7 +1430,7 @@ public final class FinalEmperialTomb extends AbstractInstance } } - protected void broadCastPacket(FETWorld world, L2GameServerPacket packet) + void broadCastPacket(FETWorld world, L2GameServerPacket packet) { for (int objId : world.getAllowed()) { @@ -1443,7 +1442,7 @@ public final class FinalEmperialTomb extends AbstractInstance } } - protected void updateKnownList(FETWorld world, L2Npc npc) + void updateKnownList(FETWorld world, L2Npc npc) { final Map npcKnownPlayers = npc.getKnownList().getKnownPlayers(); for (int objId : world.getAllowed()) diff --git a/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java b/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java index 353d688e88..2f86fe9953 100644 --- a/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java +++ b/trunk/dist/game/data/scripts/instances/HarnakUndergroundRuins/HarnakUndergroundRuins.java @@ -45,19 +45,19 @@ import instances.AbstractInstance; */ public final class HarnakUndergroundRuins extends AbstractInstance { - protected class HuRWorld extends InstanceWorld + class HuRWorld extends InstanceWorld { - protected int wave = 0; - protected int currentNpc = 0; - protected int waveNpcId = 0; - protected int maximalDefenseCounter = 0; - protected int timerCount = 0; - protected int enabledSeal = 0; - protected Set spawnedNpc = Collections.newSetFromMap(new ConcurrentHashMap()); - protected boolean openingPlayed = false; - protected boolean harnakMessage1 = false; - protected boolean harnakMessage2 = false; - protected boolean harnakMessage3 = false; + int wave = 0; + int currentNpc = 0; + int waveNpcId = 0; + int maximalDefenseCounter = 0; + int timerCount = 0; + int enabledSeal = 0; + final Set spawnedNpc = Collections.newSetFromMap(new ConcurrentHashMap()); + boolean openingPlayed = false; + boolean harnakMessage1 = false; + boolean harnakMessage2 = false; + boolean harnakMessage3 = false; } // NPCs diff --git a/trunk/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java b/trunk/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java index ddf641f933..b577baa04a 100644 --- a/trunk/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java +++ b/trunk/dist/game/data/scripts/instances/HideoutOfTheDawn/HideoutOfTheDawn.java @@ -30,7 +30,7 @@ import instances.AbstractInstance; */ public final class HideoutOfTheDawn extends AbstractInstance { - protected class HotDWorld extends InstanceWorld + class HotDWorld extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java b/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java index 41b36d8159..d5e43c055a 100644 --- a/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java +++ b/trunk/dist/game/data/scripts/instances/IceQueensCastle/IceQueensCastle.java @@ -40,7 +40,7 @@ import quests.Q10285_MeetingSirra.Q10285_MeetingSirra; */ public final class IceQueensCastle extends AbstractInstance { - protected class IQCWorld extends InstanceWorld + class IQCWorld extends InstanceWorld { L2PcInstance player = null; } diff --git a/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java b/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java index 1659a864bd..69084eb154 100644 --- a/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java +++ b/trunk/dist/game/data/scripts/instances/IceQueensCastleBattle/IceQueensCastleBattle.java @@ -62,18 +62,18 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra; */ public final class IceQueensCastleBattle extends AbstractInstance { - protected class IQCNBWorld extends InstanceWorld + class IQCNBWorld extends InstanceWorld { - protected List playersInside = new ArrayList<>(); - protected List knightStatues = new ArrayList<>(); - protected List spawnedMobs = new CopyOnWriteArrayList<>(); - protected L2NpcInstance controller = null; - protected L2GrandBossInstance freya = null; - protected L2QuestGuardInstance supp_Jinia = null; - protected L2QuestGuardInstance supp_Kegor = null; - protected boolean isSupportActive = false; - protected boolean canSpawnMobs = true; - protected boolean isHardCore = false; + final List playersInside = new ArrayList<>(); + final List knightStatues = new ArrayList<>(); + final List spawnedMobs = new CopyOnWriteArrayList<>(); + L2NpcInstance controller = null; + L2GrandBossInstance freya = null; + L2QuestGuardInstance supp_Jinia = null; + L2QuestGuardInstance supp_Kegor = null; + boolean isSupportActive = false; + boolean canSpawnMobs = true; + boolean isHardCore = false; } // Npcs diff --git a/trunk/dist/game/data/scripts/instances/InstanceLoader.java b/trunk/dist/game/data/scripts/instances/InstanceLoader.java index ece11db2dc..72bc768a26 100644 --- a/trunk/dist/game/data/scripts/instances/InstanceLoader.java +++ b/trunk/dist/game/data/scripts/instances/InstanceLoader.java @@ -59,7 +59,7 @@ import instances.SanctumOftheLordsOfDawn.SanctumOftheLordsOfDawn; * Instance class-loader. * @author FallenAngel */ -public final class InstanceLoader +final class InstanceLoader { private static final Logger _log = Logger.getLogger(InstanceLoader.class.getName()); diff --git a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java index 611e4bcf73..507adbd211 100644 --- a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java +++ b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout1/JiniaGuildHideout1.java @@ -31,7 +31,7 @@ import quests.Q10284_AcquisitionOfDivineSword.Q10284_AcquisitionOfDivineSword; */ public final class JiniaGuildHideout1 extends AbstractInstance { - protected class JGH1World extends InstanceWorld + class JGH1World extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java index 3e29b2648f..89e5817ce4 100644 --- a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java +++ b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout2/JiniaGuildHideout2.java @@ -31,7 +31,7 @@ import quests.Q10285_MeetingSirra.Q10285_MeetingSirra; */ public final class JiniaGuildHideout2 extends AbstractInstance { - protected class JGH2World extends InstanceWorld + class JGH2World extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java index 38cc2d3f0f..44ff39844c 100644 --- a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java +++ b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout3/JiniaGuildHideout3.java @@ -31,7 +31,7 @@ import quests.Q10286_ReunionWithSirra.Q10286_ReunionWithSirra; */ public final class JiniaGuildHideout3 extends AbstractInstance { - protected class JGH3World extends InstanceWorld + class JGH3World extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java index b3f6a4ed5d..d8d1329e53 100644 --- a/trunk/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java +++ b/trunk/dist/game/data/scripts/instances/JiniaGuildHideout4/JiniaGuildHideout4.java @@ -31,7 +31,7 @@ import quests.Q10287_StoryOfThoseLeft.Q10287_StoryOfThoseLeft; */ public final class JiniaGuildHideout4 extends AbstractInstance { - protected class JGH4World extends InstanceWorld + class JGH4World extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java b/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java index ba7536cad8..86ee428451 100644 --- a/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java +++ b/trunk/dist/game/data/scripts/instances/Kamaloka/Kamaloka.java @@ -97,7 +97,7 @@ public final class Kamaloka extends AbstractInstance * On retail only newbie guide buffs not removed
* CAUTION: array must be sorted in ascension order! */ - protected static final int[] BUFFS_WHITELIST = + private static final int[] BUFFS_WHITELIST = { 4322, 4323, 4324, 4325, 4326, 4327, 4328, 4329, 4330, 4331, 5632, 5637, 5950 }; @@ -1164,14 +1164,14 @@ public final class Kamaloka extends AbstractInstance 31340 }; - protected class KamaWorld extends InstanceWorld + class KamaWorld extends InstanceWorld { - public int index; // 0-18 index of the kama type in arrays - public int shaman = 0; // objectId of the shaman - public List firstRoom; // list of the spawns in the first room (excluding shaman) - public List secondRoom;// list of objectIds mobs in the second room - public int miniBoss = 0; // objectId of the miniboss - public L2Npc boss = null; // boss + int index; // 0-18 index of the kama type in arrays + int shaman = 0; // objectId of the shaman + List firstRoom; // list of the spawns in the first room (excluding shaman) + List secondRoom;// list of objectIds mobs in the second room + int miniBoss = 0; // objectId of the miniboss + L2Npc boss = null; // boss } public Kamaloka() diff --git a/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java b/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java index 0407eee88a..2b3bbc5998 100644 --- a/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java +++ b/trunk/dist/game/data/scripts/instances/KaraphonHabitat/KaraphonHabitat.java @@ -40,7 +40,7 @@ public class KaraphonHabitat extends AbstractInstance // Instance private static final int TEMPLATE_ID = 253; - protected class KHWorld extends InstanceWorld + class KHWorld extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/AI/Healer.java b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/AI/Healer.java index 3a6742bda9..a9d7846d00 100644 --- a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/AI/Healer.java +++ b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/AI/Healer.java @@ -29,7 +29,7 @@ import com.l2jmobius.util.Rnd; /** * @author Mobius */ -public final class Healer implements Runnable +final class Healer implements Runnable { private L2PcInstance _player; private final L2QuestGuardInstance _guard; diff --git a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index 4f27fc1bf0..5a632c916a 100644 --- a/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/trunk/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -129,15 +129,15 @@ public final class KartiasLabyrinth extends AbstractInstance private static final String KARTIA_ENTRY_VAR = "Last_Kartia_entry"; private static final String KARTIA_PARTY_ENTRY_VAR = "Last_Kartia_party_entry"; - protected class KartiaWorld extends InstanceWorld + class KartiaWorld extends InstanceWorld { - protected L2QuestGuardInstance adolph = null; - protected L2QuestGuardInstance barton = null; - protected L2QuestGuardInstance hayuk = null; - protected L2QuestGuardInstance eliyah = null; - protected L2QuestGuardInstance elise = null; - protected List playersInside = new ArrayList<>(); - protected List savedSpawns = new CopyOnWriteArrayList<>(); + L2QuestGuardInstance adolph = null; + L2QuestGuardInstance barton = null; + L2QuestGuardInstance hayuk = null; + L2QuestGuardInstance eliyah = null; + L2QuestGuardInstance elise = null; + final List playersInside = new ArrayList<>(); + final List savedSpawns = new CopyOnWriteArrayList<>(); } public KartiasLabyrinth() diff --git a/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java b/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java index 80f7e1458c..d449419a21 100644 --- a/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java +++ b/trunk/dist/game/data/scripts/instances/LabyrinthOfBelis/LabyrinthOfBelis.java @@ -81,12 +81,12 @@ public final class LabyrinthOfBelis extends AbstractInstance private static final int DOOR_8 = 16240008; private static final int DAMAGE_ZONE_ID = 10331; - protected class LOBWorld extends InstanceWorld + class LOBWorld extends InstanceWorld { - protected L2QuestGuardInstance terian = null; - protected L2Npc generator = null; - protected List savedSpawns = null; - protected boolean assistPlayer = false; + L2QuestGuardInstance terian = null; + L2Npc generator = null; + List savedSpawns = null; + boolean assistPlayer = false; } public LabyrinthOfBelis() diff --git a/trunk/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java b/trunk/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java index 92c9bd1454..605f8a5b13 100644 --- a/trunk/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java +++ b/trunk/dist/game/data/scripts/instances/LibraryOfSages/LibraryOfSages.java @@ -32,9 +32,9 @@ import instances.AbstractInstance; */ public final class LibraryOfSages extends AbstractInstance { - protected class LoSWorld extends InstanceWorld + class LoSWorld extends InstanceWorld { - protected L2Npc elcadia = null; + L2Npc elcadia = null; } // NPCs diff --git a/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java b/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java index 818750d907..ff5ff7a303 100644 --- a/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java +++ b/trunk/dist/game/data/scripts/instances/MithrilMine/MithrilMine.java @@ -38,11 +38,6 @@ import quests.Q10284_AcquisitionOfDivineSword.Q10284_AcquisitionOfDivineSword; */ public final class MithrilMine extends AbstractInstance { - protected class MMWorld extends InstanceWorld - { - protected int _count = 0; - } - // NPCs private static final int KEGOR = 18846; private static final int MITHRIL_MILLIPEDE = 22766; @@ -66,6 +61,11 @@ public final class MithrilMine extends AbstractInstance // Misc private static final int TEMPLATE_ID = 138; + class MMWorld extends InstanceWorld + { + int _count = 0; + } + public MithrilMine() { super(MithrilMine.class.getSimpleName(), "instances"); diff --git a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java index a979e3fc23..e7c91ebdd5 100644 --- a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java +++ b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence1/MonasteryOfSilence1.java @@ -33,9 +33,9 @@ import instances.AbstractInstance; */ public final class MonasteryOfSilence1 extends AbstractInstance { - protected static final class MoSWorld extends InstanceWorld + static final class MoSWorld extends InstanceWorld { - protected L2Npc elcadia = null; + L2Npc elcadia = null; } // NPCs @@ -194,7 +194,7 @@ public final class MonasteryOfSilence1 extends AbstractInstance return super.onTalk(npc, talker); } - protected void spawnElcadia(L2PcInstance player, MoSWorld world) + private void spawnElcadia(L2PcInstance player, MoSWorld world) { if (world.elcadia != null) { diff --git a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java index 28f2121fb6..62a0163026 100644 --- a/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java +++ b/trunk/dist/game/data/scripts/instances/MonasteryOfSilence2/MonasteryOfSilence2.java @@ -196,9 +196,9 @@ public class MonasteryOfSilence2 extends AbstractNpcAI private final HashMap instanceWorlds = new HashMap<>(); - public static class InstanceHolder + static class InstanceHolder { - List mobs = new ArrayList<>(); + final List mobs = new ArrayList<>(); } private class MoSWorld2 extends InstanceWorld @@ -260,7 +260,7 @@ public class MonasteryOfSilence2 extends AbstractNpcAI } } - protected void enterInstance(L2Npc npc, L2PcInstance player) + private void enterInstance(L2Npc npc, L2PcInstance player) { InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); if (world != null) diff --git a/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java b/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java index a7fcafa118..2c2d5a0816 100644 --- a/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java +++ b/trunk/dist/game/data/scripts/instances/MuseumDungeon/MuseumDungeon.java @@ -54,12 +54,12 @@ public final class MuseumDungeon extends AbstractInstance private static final Location START_LOC = new Location(-114711, 243911, -7968); private static final Location TOYRON_SPAWN_LOC = new Location(-114707, 245428, -7968); - protected class MDWorld extends InstanceWorld + class MDWorld extends InstanceWorld { - protected L2QuestGuardInstance toyron = null; - protected List deskSpawns = null; - protected List thiefSpawns = null; - protected int randomDesk = 0; + L2QuestGuardInstance toyron = null; + List deskSpawns = null; + List thiefSpawns = null; + int randomDesk = 0; } public MuseumDungeon() diff --git a/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java b/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java index 5816c35da4..9ab70a34ed 100644 --- a/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java +++ b/trunk/dist/game/data/scripts/instances/NornilsGarden/NornilsGarden.java @@ -43,13 +43,13 @@ import instances.AbstractInstance; */ public final class NornilsGarden extends AbstractInstance { - protected class NornilsWorld extends InstanceWorld + class NornilsWorld extends InstanceWorld { - protected L2Npc first_npc = null; - protected boolean spawned_1 = false; - protected boolean spawned_2 = false; - protected boolean spawned_3 = false; - protected boolean spawned_4 = false; + L2Npc first_npc = null; + boolean spawned_1 = false; + boolean spawned_2 = false; + boolean spawned_3 = false; + boolean spawned_4 = false; } // NPCs @@ -389,7 +389,7 @@ public final class NornilsGarden extends AbstractInstance } } - public void openDoor(QuestState st, L2PcInstance player, int doorId) + private void openDoor(QuestState st, L2PcInstance player, int doorId) { st.unset("correct"); final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(player.getInstanceId()); diff --git a/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java b/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java index 055a3cba6e..a67e89913b 100644 --- a/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java +++ b/trunk/dist/game/data/scripts/instances/PailakaDevilsLegacy/PailakaDevilsLegacy.java @@ -41,10 +41,10 @@ import quests.Q00129_PailakaDevilsLegacy.Q00129_PailakaDevilsLegacy; */ public final class PailakaDevilsLegacy extends AbstractInstance { - protected class DIWorld extends InstanceWorld + class DIWorld extends InstanceWorld { - protected L2Attackable _lematanNpc = null; - protected List _followerslist = new CopyOnWriteArrayList<>(); + L2Attackable _lematanNpc = null; + final List _followerslist = new CopyOnWriteArrayList<>(); } // NPCs diff --git a/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java b/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java index 2a8a077a5c..19131b2b13 100644 --- a/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java +++ b/trunk/dist/game/data/scripts/instances/PailakaSongOfIceAndFire/PailakaSongOfIceAndFire.java @@ -34,7 +34,7 @@ import instances.AbstractInstance; */ public final class PailakaSongOfIceAndFire extends AbstractInstance { - protected class PSoIWorld extends InstanceWorld + class PSoIWorld extends InstanceWorld { } diff --git a/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java b/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java index a237539061..e855af368e 100644 --- a/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java +++ b/trunk/dist/game/data/scripts/instances/SanctumOftheLordsOfDawn/SanctumOftheLordsOfDawn.java @@ -43,12 +43,12 @@ import quests.Q00195_SevenSignsSecretRitualOfThePriests.Q00195_SevenSignsSecretR */ public final class SanctumOftheLordsOfDawn extends AbstractInstance { - protected static final class HSWorld extends InstanceWorld + static final class HSWorld extends InstanceWorld { - protected int doorst = 0; - protected final static Map> _save_point = new HashMap<>(); + int doorst = 0; + final static Map> _save_point = new HashMap<>(); - public static Map> getMonsters() + static Map> getMonsters() { return _save_point; } diff --git a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java index 5361217638..194929d4c5 100644 --- a/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java +++ b/trunk/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java @@ -54,7 +54,7 @@ public class Q00144_PailakaInjuredDragon extends Quest private static final int MAX_SUMMON_LEVEL = 80; private static final int EXIT_TIME = 5; private static final int INSTANCE_ID = 45; - protected static final int[] TELEPORT = + static final int[] TELEPORT = { 125757, -40928, @@ -831,31 +831,6 @@ public class Q00144_PailakaInjuredDragon extends Quest } } - static final class Teleport implements Runnable - { - private final L2Character _char; - private final int _instanceId; - - public Teleport(L2Character c, int id) - { - _char = c; - _instanceId = id; - } - - @Override - public void run() - { - try - { - teleportPlayer((L2PcInstance) _char, TELEPORT, _instanceId); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - } - private static class PailakaDrop { private final int _itemId; @@ -913,7 +888,7 @@ public class Q00144_PailakaInjuredDragon extends Quest return; } - protected static final void teleportPlayer(L2PcInstance player, int[] coords, int instanceId) + private static final void teleportPlayer(L2PcInstance player, int[] coords, int instanceId) { player.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); player.setInstanceId(instanceId); diff --git a/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java b/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java index 0d48db44d4..79d2c6a9e1 100644 --- a/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java +++ b/trunk/dist/game/data/scripts/quests/Q00254_LegendaryTales/Q00254_LegendaryTales.java @@ -33,7 +33,7 @@ public class Q00254_LegendaryTales extends Quest private static final int GILMORE = 30754; // Monsters - public enum Bosses + private enum Bosses { EMERALD_HORN(25718), DUST_RIDER(25719), diff --git a/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java b/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java index 1db0ac48e2..43226e9638 100644 --- a/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java +++ b/trunk/dist/game/data/scripts/quests/Q00350_EnhanceYourWeapon/Q00350_EnhanceYourWeapon.java @@ -356,7 +356,7 @@ public class Q00350_EnhanceYourWeapon extends Quest * @param mob * @param killer The player that last killed this L2Attackable $ Rewrite 06.12.06 - Yesod $ Rewrite 08.01.10 - Gigiikun */ - public static void levelSoulCrystals(L2Attackable mob, L2PcInstance killer) + private static void levelSoulCrystals(L2Attackable mob, L2PcInstance killer) { // Only L2PcInstance can absorb a soul if (killer == null) diff --git a/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java b/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java index 7436258481..c496857142 100644 --- a/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java +++ b/trunk/dist/game/data/scripts/quests/Q00457_LostAndFound/Q00457_LostAndFound.java @@ -242,7 +242,7 @@ public final class Q00457_LostAndFound extends Quest return super.onSpawn(npc); } - public void broadcastNpcSay(L2Npc npc, L2PcInstance player, NpcStringId stringId, boolean whisper) + private void broadcastNpcSay(L2Npc npc, L2PcInstance player, NpcStringId stringId, boolean whisper) { ((whisper) ? player : npc).sendPacket(new NpcSay(npc.getObjectId(), ((whisper) ? ChatType.NPC_WHISPER : ChatType.NPC_GENERAL), npc.getId(), stringId)); } diff --git a/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java b/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java index 29cb6dd31c..bb8c613b06 100644 --- a/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java +++ b/trunk/dist/game/data/scripts/quests/Q00511_AwlUnderFoot/Q00511_AwlUnderFoot.java @@ -44,16 +44,16 @@ import com.l2jmobius.gameserver.util.Util; */ public final class Q00511_AwlUnderFoot extends Quest { - protected class FAUWorld extends InstanceWorld + class FAUWorld extends InstanceWorld { } - public static class FortDungeon + private static class FortDungeon { private final int INSTANCEID; private long _reEnterTime = 0; - public FortDungeon(int iId) + FortDungeon(int iId) { INSTANCEID = iId; } @@ -125,20 +125,20 @@ public final class Q00511_AwlUnderFoot extends Quest // REWARDS private static final int KNIGHT_EPALUETTE = 9912; // MONSTER TO KILL -- Only last 3 Raids (lvl ordered) give DL_MARK - protected static final int[] RAIDS1 = + static final int[] RAIDS1 = { 25572, 25575, 25578 }; - protected static final int[] RAIDS2 = + static final int[] RAIDS2 = { 25579, 25582, 25585, 25588 }; - protected static final int[] RAIDS3 = + static final int[] RAIDS3 = { 25589, 25592, @@ -259,7 +259,7 @@ public final class Q00511_AwlUnderFoot extends Quest return null; } - protected String enterInstance(L2PcInstance player, String template, int[] coords, FortDungeon dungeon, String ret) + private String enterInstance(L2PcInstance player, String template, int[] coords, FortDungeon dungeon, String ret) { // check for existing instances for this player InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(player); diff --git a/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java b/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java index 2cbb584255..f665e9d9d7 100644 --- a/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java +++ b/trunk/dist/game/data/scripts/quests/Q00641_AttackSailren/Q00641_AttackSailren.java @@ -34,10 +34,10 @@ public class Q00641_AttackSailren extends Quest // NPC private static final int SHILENS_STONE_STATUE = 32109; // Items - public static final int GAZKH_FRAGMENT = 8782; - public static final int GAZKH = 8784; + private static final int GAZKH_FRAGMENT = 8782; + private static final int GAZKH = 8784; - public static int[] MOBS = + private static int[] MOBS = { 22196, // Velociraptor 22197, // Velociraptor diff --git a/trunk/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java b/trunk/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java index 670b915dd1..9fe1423128 100644 --- a/trunk/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java +++ b/trunk/dist/game/data/scripts/quests/Q00901_HowLavasaurusesAreMade/Q00901_HowLavasaurusesAreMade.java @@ -177,7 +177,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest return htmltext; } - public static void giveQuestItems(QuestState st, int itemId) + private static void giveQuestItems(QuestState st, int itemId) { if (st.getQuestItemsCount(itemId) < 10) { @@ -190,7 +190,7 @@ public class Q00901_HowLavasaurusesAreMade extends Quest } } - public static boolean gotAllQuestItems(QuestState st) + private static boolean gotAllQuestItems(QuestState st) { return (st.getQuestItemsCount(FRAGMENT_STONE) >= 10) && (st.getQuestItemsCount(FRAGMENT_HEAD) >= 10) && (st.getQuestItemsCount(FRAGMENT_BODY) >= 10) && (st.getQuestItemsCount(FRAGMENT_HORN) >= 10); } diff --git a/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 3d3574d789..d524bd5fb7 100644 --- a/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/trunk/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -43,7 +43,7 @@ public final class Q10292_SevenSignsGirlOfDoubt extends Quest private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); // Misc private static final int MIN_LEVEL = 81; - boolean isBusy = false; + private boolean isBusy = false; // Monster private static final int CREATURE_OF_THE_DUSK1 = 27422; private static final int CREATURE_OF_THE_DUSK2 = 27424; diff --git a/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java b/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java index 3fb7e47d5f..09f62d47a2 100644 --- a/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java +++ b/trunk/dist/game/data/scripts/quests/Q10294_SevenSignsToTheMonasteryOfSilence/Q10294_SevenSignsToTheMonasteryOfSilence.java @@ -441,7 +441,7 @@ public final class Q10294_SevenSignsToTheMonasteryOfSilence extends Quest return htmltext; } - public boolean hasCheckedAllRightBooks(QuestState qs) + private boolean hasCheckedAllRightBooks(QuestState qs) { return ((qs.getInt("good1") == 1) && (qs.getInt("good2") == 1) && (qs.getInt("good3") == 1) && (qs.getInt("good4") == 1)); } diff --git a/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java index 563fd62a95..0ef877ab46 100644 --- a/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java +++ b/trunk/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java @@ -51,8 +51,8 @@ public final class Q10320_LetsGoToTheCentralSquare extends Quest // Variables names private static final String MOVIE_VAR = "TI_presentation_movie"; // Movies - public static final int SCENE_SI_ILLUSION_01_QUE = 101; - public static final int SCENE_SI_ILLUSION_02_QUE = 102; + private static final int SCENE_SI_ILLUSION_01_QUE = 101; + private static final int SCENE_SI_ILLUSION_02_QUE = 102; public Q10320_LetsGoToTheCentralSquare() { diff --git a/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java index 2c25c6b375..9604d66fb7 100644 --- a/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java +++ b/trunk/dist/game/data/scripts/quests/Q10742_AFurryFriend/Q10742_AFurryFriend.java @@ -43,7 +43,7 @@ public class Q10742_AFurryFriend extends Quest // Location private static final Location RICKY_SPAWN = new Location(-78138, 237328, -3548); // Waypoints - protected static Location[] WAYPOINTS = + private static Location[] WAYPOINTS = { new Location(-78152, 237352, -3569), new Location(-79176, 236792, -3440), diff --git a/trunk/dist/game/data/scripts/quests/Q10755_LettersFromTheQueen_WindyHill/Q10755_LettersFromTheQueen_WindyHill.java b/trunk/dist/game/data/scripts/quests/Q10755_LettersFromTheQueen_WindyHill/Q10755_LettersFromTheQueen_WindyHill.java index fbd9a00e9c..78ecab103b 100644 --- a/trunk/dist/game/data/scripts/quests/Q10755_LettersFromTheQueen_WindyHill/Q10755_LettersFromTheQueen_WindyHill.java +++ b/trunk/dist/game/data/scripts/quests/Q10755_LettersFromTheQueen_WindyHill/Q10755_LettersFromTheQueen_WindyHill.java @@ -96,9 +96,8 @@ public class Q10755_LettersFromTheQueen_WindyHill extends Quest implements IBypa showOnScreenMsg(player, NpcStringId.TRY_USING_THE_TELEPORT_SCROLL_LEVIAN_GAVE_YOU, ExShowScreenMessage.TOP_CENTER, 4500); } htmltext = event; - } break; - + } case "33963-03.html": { if (qs.isCond(1)) diff --git a/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java b/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java index b2bc877f7e..c0c4e2ee54 100644 --- a/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java +++ b/trunk/dist/game/data/scripts/quests/QuestMasterHandler.java @@ -265,7 +265,7 @@ import quests.Q10764_FreeSpirit.Q10764_FreeSpirit; /** * @author NosBit */ -public class QuestMasterHandler +final class QuestMasterHandler { private static final Logger _log = Logger.getLogger(QuestMasterHandler.class.getName()); diff --git a/trunk/dist/game/data/scripts/vehicles/BoatGludinRune.java b/trunk/dist/game/data/scripts/vehicles/BoatGludinRune.java index 95b805150e..cf8371723c 100644 --- a/trunk/dist/game/data/scripts/vehicles/BoatGludinRune.java +++ b/trunk/dist/game/data/scripts/vehicles/BoatGludinRune.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; /** * @author DS */ -public class BoatGludinRune implements Runnable +final class BoatGludinRune implements Runnable { private static final Logger _log = Logger.getLogger(BoatGludinRune.class.getName()); diff --git a/trunk/dist/game/data/scripts/vehicles/BoatInnadrilTour.java b/trunk/dist/game/data/scripts/vehicles/BoatInnadrilTour.java index b420223d09..8f38716ec4 100644 --- a/trunk/dist/game/data/scripts/vehicles/BoatInnadrilTour.java +++ b/trunk/dist/game/data/scripts/vehicles/BoatInnadrilTour.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; /** * @author DS */ -public class BoatInnadrilTour implements Runnable +final class BoatInnadrilTour implements Runnable { private static final Logger _log = Logger.getLogger(BoatInnadrilTour.class.getName()); diff --git a/trunk/dist/game/data/scripts/vehicles/BoatRunePrimeval.java b/trunk/dist/game/data/scripts/vehicles/BoatRunePrimeval.java index 2a7db7be03..3a770b7478 100644 --- a/trunk/dist/game/data/scripts/vehicles/BoatRunePrimeval.java +++ b/trunk/dist/game/data/scripts/vehicles/BoatRunePrimeval.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.network.serverpackets.PlaySound; /** * @author DS */ -public class BoatRunePrimeval implements Runnable +final class BoatRunePrimeval implements Runnable { private static final Logger _log = Logger.getLogger(BoatRunePrimeval.class.getName()); diff --git a/trunk/dist/game/data/scripts/village_master/Alliance/Alliance.java b/trunk/dist/game/data/scripts/village_master/Alliance/Alliance.java index 9bb1710fec..293333cd93 100644 --- a/trunk/dist/game/data/scripts/village_master/Alliance/Alliance.java +++ b/trunk/dist/game/data/scripts/village_master/Alliance/Alliance.java @@ -23,7 +23,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; /** * @author UnAfraid */ -public final class Alliance extends Quest +final class Alliance extends Quest { // @formatter:off private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/village_master/Clan/Clan.java b/trunk/dist/game/data/scripts/village_master/Clan/Clan.java index 513ed9336e..4f2431f4e2 100644 --- a/trunk/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/trunk/dist/game/data/scripts/village_master/Clan/Clan.java @@ -26,7 +26,7 @@ import com.l2jmobius.gameserver.model.quest.Quest; /** * @author UnAfraid */ -public final class Clan extends Quest +final class Clan extends Quest { // @formatter:off private static final int[] NPCS = diff --git a/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java b/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java index 02df35dae1..9538c92c37 100644 --- a/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java +++ b/trunk/dist/game/data/scripts/village_master/ProofOfCourage/ProofOfCourage.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Proof Of Courage implementation. * @author St3eT */ -public final class ProofOfCourage extends AbstractNpcAI +final class ProofOfCourage extends AbstractNpcAI { // Misc private static final Map> CLASSLIST = new HashMap<>(); diff --git a/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java b/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java index ac73ab10c8..d569f14325 100644 --- a/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java +++ b/trunk/dist/game/data/scripts/village_master/ProofOfJustice/ProofOfJustice.java @@ -32,7 +32,7 @@ import ai.npc.AbstractNpcAI; * Proof Of Justice implementation. * @author St3eT */ -public final class ProofOfJustice extends AbstractNpcAI +final class ProofOfJustice extends AbstractNpcAI { // Misc private static final Map> CLASSLIST = new HashMap<>();