Cleanup of unnecessary void method and class modifiers.

2022-12-13 22:13:36 +00:00
parent 7e3dd71d77
commit e6085edc4c
2172 changed files with 3581 additions and 3581 deletions
@@ -142,7 +142,7 @@ public class TarBeetleSpawn implements IXmlReader
 		npc.deleteMe();
 	}
 	
-	private final class Zone extends Territory
+	private class Zone extends Territory
 	{
 		private List<Zone> _bannedZones;
 		
@@ -187,7 +187,7 @@ public class TarBeetleSpawn implements IXmlReader
 		}
 	}
 	
-	private final class SpawnZone
+	private class SpawnZone
 	{
 		private final List<Zone> _zones = new ArrayList<>();
 		private final Collection<Npc> _spawn = ConcurrentHashMap.newKeySet();
@@ -44,7 +44,7 @@ import ai.AbstractNpcAI;

 public abstract class AirShipController extends AbstractNpcAI
 {
-	protected final class DecayTask implements Runnable
+	protected class DecayTask implements Runnable
 	{
 		@Override
 		public void run()
@@ -56,7 +56,7 @@ public abstract class AirShipController extends AbstractNpcAI
 		}
 	}
 	
-	protected final class DepartTask implements Runnable
+	protected class DepartTask implements Runnable
 	{
 		@Override
 		public void run()
@@ -119,7 +119,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 		_ship.runEngine(60000);
 	}
 	
-	private final void broadcastInGludio(NpcStringId npcString)
+	private void broadcastInGludio(NpcStringId npcString)
 	{
 		if (!_foundAtcGludio)
 		{
@@ -132,7 +132,7 @@ public class AirShipGludioGracia extends AbstractNpcAI implements Runnable
 		}
 	}
 	
-	private final void broadcastInGracia(NpcStringId npcStringId)
+	private void broadcastInGracia(NpcStringId npcStringId)
 	{
 		if (!_foundAtcGracia)
 		{
@@ -769,7 +769,7 @@ public class Antharas extends AbstractNpcAI
 		GrandBossManager.getInstance().getStatSet(ANTHARAS).set("respawn_time", System.currentTimeMillis() + respawnTime);
 	}
 	
-	private final void refreshAiParams(Player attacker, int damage)
+	private void refreshAiParams(Player attacker, int damage)
 	{
 		if ((attacker_1 != null) && (attacker == attacker_1))
 		{
@@ -616,12 +616,12 @@ public class Baium extends AbstractNpcAI
 		return super.unload(removeFromList);
 	}
 	
-	private final void refreshAiParams(Creature attacker, Npc npc, int damage)
+	private void refreshAiParams(Creature attacker, Npc npc, int damage)
 	{
 		refreshAiParams(attacker, npc, damage, damage);
 	}
 	
-	private final void refreshAiParams(Creature attacker, Npc npc, int damage, int aggro)
+	private void refreshAiParams(Creature attacker, Npc npc, int damage, int aggro)
 	{
 		final int newAggroVal = damage + getRandom(3000);
 		final int aggroVal = aggro + 1000;
@@ -33,7 +33,7 @@ import ai.AbstractNpcAI;
 */
 public class AltarsOfSacrifice extends AbstractNpcAI
 {
-	private final class Altar
+	private class Altar
 	{
 		private final ILocational _middlePoint;
 		private final int[] _bossNpcIds;
@@ -172,7 +172,7 @@ public class CastleChamberlain extends AbstractNpcAI
 		return "chamberlain-21.html";
 	}
 	
-	private final void funcReplace(Castle castle, NpcHtmlMessage html, int func, String str)
+	private void funcReplace(Castle castle, NpcHtmlMessage html, int func, String str)
 	{
 		final CastleFunction function = castle.getFunction(func);
 		if (function == null)
@@ -163,7 +163,7 @@ public class VarkaKetra extends AbstractNpcAI
 		}
 	}
 	
-	private final void decreaseAlliance(Player player, int[] marks)
+	private void decreaseAlliance(Player player, int[] marks)
 	{
 		for (int i = 0; i < marks.length; i++)
 		{
@@ -179,7 +179,7 @@ public class VarkaKetra extends AbstractNpcAI
 		}
 	}
 	
-	private final void exitQuests(Player player, String[] quests)
+	private void exitQuests(Player player, String[] quests)
 	{
 		for (String quest : quests)
 		{
@@ -87,7 +87,7 @@ public class FortressOfResistance extends ClanHallSiegeEngine
 		}
 	}
 	
-	private final void buildMessengerMessage()
+	private void buildMessengerMessage()
 	{
 		final String html = HtmCache.getInstance().getHtm(null, "data/scripts/conquerablehalls/FortressOfResistance/partisan_ordery_brakel001.htm");
 		if (html != null)
@@ -671,7 +671,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		saveMember(clanId, clan.getLeaderId());
 	}
 	
-	private final void doUnSpawns(ClanData data)
+	private void doUnSpawns(ClanData data)
 	{
 		if (data.flagInstance != null)
 		{
@@ -685,7 +685,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 	}
 	
-	private final void removeParticipant(int clanId, boolean teleport)
+	private void removeParticipant(int clanId, boolean teleport)
 	{
 		final ClanData dat = _data.remove(clanId);
 		if (dat != null)
@@ -777,7 +777,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 	}
 	
-	private final void loadAttackerMembers(int clanId)
+	private void loadAttackerMembers(int clanId)
 	{
 		try (Connection con = DatabaseFactory.getConnection())
 		{
@@ -805,7 +805,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 	}
 	
-	private final void saveClan(int clanId, int flag)
+	private void saveClan(int clanId, int flag)
 	{
 		try (Connection con = DatabaseFactory.getConnection())
 		{
@@ -823,7 +823,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 	}
 	
-	private final void saveNpc(int npc, int clanId)
+	private void saveNpc(int npc, int clanId)
 	{
 		try (Connection con = DatabaseFactory.getConnection())
 		{
@@ -839,7 +839,7 @@ public abstract class FlagWar extends ClanHallSiegeEngine
 		}
 	}
 	
-	private final void saveMember(int clanId, int objectId)
+	private void saveMember(int clanId, int objectId)
 	{
 		try (Connection con = DatabaseFactory.getConnection())
 		{
@@ -1448,7 +1448,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(adminReply);
 	}
 	
-	private final class IpPack
+	private class IpPack
 	{
 		String ip;
 		int[][] tracert;
@@ -1585,7 +1585,7 @@ public class AdminEditChar implements IAdminCommandHandler
 		activeChar.sendPacket(html);
 	}
 	
-	private final class Untransform implements Runnable
+	private class Untransform implements Runnable
 	{
 		private final Player _player;
 		
@@ -77,7 +77,7 @@ public class AdminHtml implements IAdminCommandHandler
 	 * @param activeChar activeChar where html is shown
 	 * @param path relative path from directory data/html/admin/ to html
 	 */
-	static void showAdminHtml(Player activeChar, String path)
+	public static void showAdminHtml(Player activeChar, String path)
 	{
 		showHtml(activeChar, "data/html/admin/" + path, false);
 	}
@@ -452,7 +452,7 @@ public class Wedding implements IVoicedCommandHandler
 		return true;
 	}
 	
-	static class EscapeFinalizer implements Runnable
+	private static class EscapeFinalizer implements Runnable
 	{
 		private final Player _player;
 		private final Location _partnerLoc;
@@ -613,7 +613,7 @@ public class Kamaloka extends AbstractInstance
 	 * @param world instanceWorld
 	 */
 	@Override
-	protected final void finishInstance(InstanceWorld world)
+	protected void finishInstance(InstanceWorld world)
 	{
 		if (world instanceof KamaWorld)
 		{
@@ -653,7 +653,7 @@ public class Kamaloka extends AbstractInstance
 	 * Spawn all NPCs in kamaloka
 	 * @param world instanceWorld
 	 */
-	private final void spawnKama(KamaWorld world)
+	private void spawnKama(KamaWorld world)
 	{
 		int[] npcs;
 		int[][] spawns;
@@ -37,7 +37,7 @@ import quests.Q00281_HeadForTheHills.Q00281_HeadForTheHills;
 */
 public class Q00257_TheGuardIsBusy extends Quest
 {
-	public static final class MobDrop extends ItemHolder
+	public static class MobDrop extends ItemHolder
 	{
 		private final int _chance;
 		private final int _random;
@@ -59,7 +59,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
 		PARTY_RANDOM
 	}
 	
-	private static final class LevelingInfo
+	private static class LevelingInfo
 	{
 		private final AbsorbCrystalType _absorbCrystalType;
 		private final boolean _isSkillNeeded;
@@ -88,7 +88,7 @@ public class Q00350_EnhanceYourWeapon extends Quest
 		}
 	}
 	
-	private static final class SoulCrystal
+	private static class SoulCrystal
 	{
 		private final int _level;
 		private final int _itemId;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
 */
 public class Q00352_HelpRoodRaiseANewPet extends Quest
 {
-	private static final class DropInfo
+	private static class DropInfo
 	{
 		public int _firstChance;
 		public int _secondChance;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
 */
 public class Q00355_FamilyHonor extends Quest
 {
-	private static final class DropInfo
+	private static class DropInfo
 	{
 		public int _firstChance;
 		public int _secondChance;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.util.Util;
 */
 public class Q00371_ShrieksOfGhosts extends Quest
 {
-	private static final class DropInfo
+	private static class DropInfo
 	{
 		public int _firstChance;
 		public int _secondChance;
@@ -452,7 +452,7 @@ public class Q00373_SupplierOfReagents extends Quest
 		return htmltext;
 	}
 	
-	private static final class Entry
+	private static class Entry
 	{
 		private final int item;
 		private final String html;
@@ -486,7 +486,7 @@ public class Q00421_LittleWingsBigAdventure extends Quest
 		return player.getInventory().getItemByItemId(fluteItemId);
 	}
 	
-	private static final class NpcData
+	private static class NpcData
 	{
 		public NpcStringId message;
 		public int memoStateMod;
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.util.Util;
 */
 public class Q00512_BladeUnderFoot extends Quest
 {
-	private static final class DropInfo
+	private static class DropInfo
 	{
 		public int _firstChance;
 		public int _secondChance;
@@ -31,7 +31,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState;
 */
 public class Q00619_RelicsOfTheOldEmpire extends Quest
 {
-	private static final class DropInfo
+	private static class DropInfo
 	{
 		public double _dropChance;
 		public int _doubleItemChance;
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
 * Path to Becoming a Lord - Gludio (708)
 * @author Sacrifice
 */
-public final class Q00708_PathToBecomingALordGludio extends Quest
+public class Q00708_PathToBecomingALordGludio extends Quest
 {
 	private static final int SAYRES = 35100;
 	private static final int PINTER = 30298;
@@ -35,7 +35,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
 * Path to Becoming a Lord - Dion (709)
 * @author Sacrifice
 */
-public final class Q00709_PathToBecomingALordDion extends Quest
+public class Q00709_PathToBecomingALordDion extends Quest
 {
 	private static final int CROSBY = 35142;
 	private static final int ROUKE = 31418;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
 * Path to Becoming a Lord - Giran (710)
 * @author Sacrifice
 */
-public final class Q00710_PathToBecomingALordGiran extends Quest
+public class Q00710_PathToBecomingALordGiran extends Quest
 {
 	private static final int SAUL = 35184;
 	private static final int GESTO = 30511;
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
 * Path to Becoming a Lord - Innadril (711)
 * @author Sacrifice
 */
-public final class Q00711_PathToBecomingALordInnadril extends Quest
+public class Q00711_PathToBecomingALordInnadril extends Quest
 {
 	private static final int NEURATH = 35316;
 	private static final int IASON_HEINE = 30969;
@@ -34,7 +34,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
 * Path to Becoming a Lord - Oren (712)
 * @author Sacrifice
 */
-public final class Q00712_PathToBecomingALordOren extends Quest
+public class Q00712_PathToBecomingALordOren extends Quest
 {
 	private static final int BRASSEUR = 35226;
 	private static final int CROOP = 30676;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
 * Path to Becoming a Lord - Aden (713)
 * @author Sacrifice
 */
-public final class Q00713_PathToBecomingALordAden extends Quest
+public class Q00713_PathToBecomingALordAden extends Quest
 {
 	private static final int LOGAN = 35274;
 	private static final int ORVEN = 30857;
@@ -36,7 +36,7 @@ import quests.Q00121_PavelTheGiant.Q00121_PavelTheGiant;
 * Path to Becoming a Lord - Schuttgart (714)
 * @author Sacrifice
 */
-public final class Q00714_PathToBecomingALordSchuttgart extends Quest
+public class Q00714_PathToBecomingALordSchuttgart extends Quest
 {
 	private static final int AUGUST = 35555;
 	private static final int NEWYEAR = 31961;
@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.serverpackets.NpcSay;
 * Path to Becoming a Lord - Goddard (715)
 * @author Sacrifice
 */
-public final class Q00715_PathToBecomingALordGoddard extends Quest
+public class Q00715_PathToBecomingALordGoddard extends Quest
 {
 	private static final int ALFRED = 35363;
 	
@@ -39,7 +39,7 @@ import quests.Q00025_HidingBehindTheTruth.Q00025_HidingBehindTheTruth;
 * Path to Becoming a Lord - Rune (716)
 * @author Sacrifice
 */
-public final class Q00716_PathToBecomingALordRune extends Quest
+public class Q00716_PathToBecomingALordRune extends Quest
 {
 	private static final int FREDERICK = 35509;
 	private static final int AGRIPEL = 31348;
@@ -169,7 +169,7 @@ public class Q10276_MutatedKaneusGludio extends Quest
 	 * @param npcId the ID of the killed monster
 	 * @param player
 	 */
-	private final void rewardItem(int npcId, Player player)
+	private void rewardItem(int npcId, Player player)
 	{
 		if ((npcId == TOMLAN_KAMOS) && !hasQuestItems(player, TISSUE_TK))
 		{
@@ -169,7 +169,7 @@ public class Q10277_MutatedKaneusDion extends Quest
 	 * @param npcId the ID of the killed monster
 	 * @param player
 	 */
-	private final void rewardItem(int npcId, Player player)
+	private void rewardItem(int npcId, Player player)
 	{
 		if ((npcId == CRIMSON_HATU) && !hasQuestItems(player, TISSUE_CH))
 		{
@@ -169,7 +169,7 @@ public class Q10278_MutatedKaneusHeine extends Quest
 	 * @param npcId the ID of the killed monster
 	 * @param player
 	 */
-	private final void rewardItem(int npcId, Player player)
+	private void rewardItem(int npcId, Player player)
 	{
 		if ((npcId == BLADE_OTIS) && !hasQuestItems(player, TISSUE_BO))
 		{
@@ -169,7 +169,7 @@ public class Q10279_MutatedKaneusOren extends Quest
 	 * @param npcId the ID of the killed monster
 	 * @param player
 	 */
-	private final void rewardItem(int npcId, Player player)
+	private void rewardItem(int npcId, Player player)
 	{
 		if ((npcId == KAIM_ABIGORE) && !hasQuestItems(player, TISSUE_KA))
 		{
@@ -169,7 +169,7 @@ public class Q10280_MutatedKaneusSchuttgart extends Quest
 	 * @param npcId the ID of the killed monster
 	 * @param player
 	 */
-	private final void rewardItem(int npcId, Player player)
+	private void rewardItem(int npcId, Player player)
 	{
 		if ((npcId == VENOMOUS_STORACE) && !hasQuestItems(player, TISSUE_VS))
 		{
@@ -162,7 +162,7 @@ public class Q10281_MutatedKaneusRune extends Quest
 		return htmltext;
 	}
 	
-	private final void rewardItem(Player player)
+	private void rewardItem(Player player)
 	{
 		giveItems(player, TISSUE_WA, 1);
 		playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);
@@ -3349,7 +3349,7 @@ public class Config
 		return serverType;
 	}
 	
-	public static final class ClassMasterSettings
+	public static class ClassMasterSettings
 	{
 		private final Map<Integer, List<ItemHolder>> _claimItems = new HashMap<>(3);
 		private final Map<Integer, List<ItemHolder>> _rewardItems = new HashMap<>(3);
@@ -544,7 +544,7 @@ public class Shutdown extends Thread
 	 * A simple class used to track down the estimated time of method executions.<br>
 	 * Once this class is created, it saves the start time, and when you want to get the estimated time, use the getEstimatedTime() method.
 	 */
-	private static final class TimeCounter
+	private static class TimeCounter
 	{
 		private long _startTime;
 		
@@ -351,7 +351,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
 		attackPrepare();
 	}
 	
-	private final void factionNotifyAndSupport()
+	private void factionNotifyAndSupport()
 	{
 		final Creature target = getAttackTarget();
 		// Call all WorldObject of its Faction inside the Faction Range
@@ -342,7 +342,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
 		attackPrepare();
 	}
 	
-	private final void factionNotifyAndSupport()
+	private void factionNotifyAndSupport()
 	{
 		final Creature target = getAttackTarget();
 		// Call all WorldObject of its Faction inside the Faction Range
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.cache;
 /**
 * @author Sahar
 */
-public final class RelationCache
+public class RelationCache
 {
 	private final int _relation;
 	private final boolean _isAutoAttackable;
@@ -214,7 +214,7 @@ public class AugmentationData
 		}
 	}
 	
-	private final void load()
+	private void load()
 	{
 		// Load stats
 		final DocumentBuilderFactory factory2 = DocumentBuilderFactory.newInstance();
@@ -474,7 +474,7 @@ public class BotReportTable
 	/**
 	 * Represents the info about a reporter
 	 */
-	private final class ReporterCharData
+	private class ReporterCharData
 	{
 		private long _lastReport;
 		private byte _reportPoints;
@@ -510,7 +510,7 @@ public class BotReportTable
 	/**
 	 * Represents the info about a reported character
 	 */
-	private final class ReportedCharData
+	private class ReportedCharData
 	{
 		Map<Integer, Long> _reporters;
 		
@@ -556,7 +556,7 @@ public class BotReportTable
 	/**
 	 * SAX loader to parse /config/BotReportPunishments.xml file
 	 */
-	private final class PunishmentsLoader extends DefaultHandler
+	private class PunishmentsLoader extends DefaultHandler
 	{
 		PunishmentsLoader()
 		{
@@ -622,7 +622,7 @@ public class BotReportTable
 		}
 	}
 	
-	private static final class SingletonHolder
+	private static class SingletonHolder
 	{
 		static final BotReportTable INSTANCE = new BotReportTable();
 	}
@@ -181,7 +181,7 @@ public class MerchantPriceConfigTable
 	/**
 	 * @author KenM
 	 */
-	public static final class MerchantPriceConfig
+	public static class MerchantPriceConfig
 	{
 		private final int _id;
 		private final String _name;
@@ -59,7 +59,7 @@ public class CharNameTable
 		}
 	}
 	
-	private final void addName(int objectId, String name)
+	private void addName(int objectId, String name)
 	{
 		if ((name != null) && !name.equals(_chars.get(objectId)))
 		{
@@ -61,7 +61,7 @@ public class ClanHallTable
 	}
 	
 	/** Load All Clan Hall */
-	private final void load()
+	private void load()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement s = con.createStatement();
@@ -375,7 +375,7 @@ public class MultisellData implements IXmlReader
 		}
 	}
 	
-	private final void verify()
+	private void verify()
 	{
 		ListContainer list;
 		final Iterator<ListContainer> iter = _entries.values().iterator();
@@ -330,7 +330,7 @@ public enum ClassId implements IIdentifiable
 		return _nextClassIds;
 	}
 	
-	private final void addNextClassId(ClassId cId)
+	private void addNextClassId(ClassId cId)
 	{
 		_nextClassIds.add(cId);
 	}
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.geoengine.geodata;
 /**
 * @author HorridoJoho
 */
-public final class Cell
+public class Cell
 {
 	/** East NSWE flag */
 	public static final byte NSWE_EAST = 1 << 0;
@@ -29,7 +29,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.regions.Region;
 /**
 * @author HorridoJoho
 */
-public final class GeoData
+public class GeoData
 {
 	// world dimensions: 1048576 * 1048576 = 1099511627776
 	private static final int WORLD_MIN_X = -655360;
@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IBlock;
 /**
 * @author HorridoJoho
 */
-public final class ComplexBlock implements IBlock
+public class ComplexBlock implements IBlock
 {
 	private final short[] _data;
 	
@@ -21,7 +21,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.IRegion;
 /**
 * @author HorridoJoho
 */
-public final class NullRegion implements IRegion
+public class NullRegion implements IRegion
 {
 	public static final NullRegion INSTANCE = new NullRegion();
 	
@@ -27,7 +27,7 @@ import org.l2jmobius.gameserver.geoengine.geodata.blocks.MultilayerBlock;
 /**
 * @author HorridoJoho
 */
-public final class Region implements IRegion
+public class Region implements IRegion
 {
 	private final IBlock[] _blocks = new IBlock[IRegion.REGION_BLOCKS];
 	
@@ -85,7 +85,7 @@ public class CellNodeBuffer
 		return null;
 	}
 	
-	public final void free()
+	public void free()
 	{
 		_current = null;
 		
@@ -136,7 +136,7 @@ public class CellNodeBuffer
 		return result;
 	}
 	
-	private final void getNeighbors()
+	private void getNeighbors()
 	{
 		if (_current.getLoc().canGoNone())
 		{
@@ -70,7 +70,7 @@ public class EffectHandler implements IHandler<Class<? extends AbstractEffect>,
 		}
 	}
 	
-	private static final class SingletonHolder
+	private static class SingletonHolder
 	{
 		protected static final EffectHandler INSTANCE = new EffectHandler();
 	}
@@ -52,7 +52,7 @@ public class CHSiegeManager
 		loadClanHalls();
 	}
 	
-	private final void loadClanHalls()
+	private void loadClanHalls()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement s = con.createStatement();
@@ -201,7 +201,7 @@ public class CHSiegeManager
 		return SingletonHolder.INSTANCE;
 	}
 	
-	private static final class SingletonHolder
+	private static class SingletonHolder
 	{
 		protected static final CHSiegeManager INSTANCE = new CHSiegeManager();
 	}
@@ -156,7 +156,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 		}
 	}
 	
-	private final void loadDb()
+	private void loadDb()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement stProduction = con.prepareStatement("SELECT * FROM castle_manor_production WHERE castle_id=?");
@@ -242,7 +242,7 @@ public class CastleManorManager implements IXmlReader, IStorable
 	// -------------------------------------------------------
 	// Manor methods
 	// -------------------------------------------------------
-	private final void scheduleModeChange()
+	private void scheduleModeChange()
 	{
 		// Calculate next mode change
 		_nextModeChange = Calendar.getInstance();
@@ -96,7 +96,7 @@ public class ClanHallAuctionManager
 		load();
 	}
 	
-	private final void load()
+	private void load()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement s = con.createStatement();
@@ -49,7 +49,7 @@ public class CoupleManager
 		load();
 	}
 	
-	private final void load()
+	private void load()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement ps = con.createStatement();
@@ -86,7 +86,7 @@ public class CursedWeaponsManager
 		init();
 	}
 	
-	private final void load()
+	private void load()
 	{
 		try
 		{
@@ -162,7 +162,7 @@ public class CursedWeaponsManager
 		}
 	}
 	
-	private final void restore()
+	private void restore()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement s = con.createStatement();
@@ -187,7 +187,7 @@ public class CursedWeaponsManager
 		}
 	}
 	
-	private final void controlPlayers()
+	private void controlPlayers()
 	{
 		// TODO: See comments below...
 		// This entire for loop should NOT be necessary, since it is already handled by
@@ -113,7 +113,7 @@ public class FortSiegeManager
 		character.removeSkill(CommonSkill.BUILD_HEADQUARTERS.getSkill());
 	}
 	
-	private final void load()
+	private void load()
 	{
 		final Properties siegeSettings = new Properties();
 		final File file = new File(Config.FORTSIEGE_CONFIG_FILE);
@@ -142,7 +142,7 @@ public class MercTicketManager
 	/**
 	 * Load merc tickets into the world.
 	 */
-	private final void load()
+	private void load()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement s = con.createStatement();
@@ -49,7 +49,7 @@ public class RaidBossPointsManager
 		init();
 	}
 	
-	private final void init()
+	private void init()
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			Statement s = con.createStatement();
@@ -116,7 +116,7 @@ public class SiegeManager
 		}
 	}
 	
-	private final void load()
+	private void load()
 	{
 		final PropertiesParser siegeSettings = new PropertiesParser(Config.SIEGE_CONFIG_FILE);
 		
@@ -274,7 +274,7 @@ public class SiegeManager
 		return sieges;
 	}
 	
-	private final void loadTrapUpgrade(int castleId)
+	private void loadTrapUpgrade(int castleId)
 	{
 		try (Connection con = DatabaseFactory.getConnection();
 			PreparedStatement ps = con.prepareStatement("SELECT * FROM castle_trapupgrade WHERE castleId=?"))
@@ -775,7 +775,7 @@ public class TerritoryWarManager implements Siegable
 		}
 	}
 	
-	private final void load()
+	private void load()
 	{
 		final PropertiesParser territoryWarSettings = new PropertiesParser(Config.TW_CONFIG_FILE);
 		
@@ -374,7 +374,7 @@ public class Message
 		_attachments = null;
 	}
 	
-	static class AttachmentsUnloadTask implements Runnable
+	private static class AttachmentsUnloadTask implements Runnable
 	{
 		private Message _msg;
 		
@@ -243,7 +243,7 @@ public class PetData
 		return _skills;
 	}
 	
-	public static final class PetSkillLearn extends SkillHolder
+	public static class PetSkillLearn extends SkillHolder
 	{
 		private final int _minLevel;
 		
@@ -86,7 +86,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	 * Sets the instance type.
 	 * @param newInstanceType the instance type to set
 	 */
-	protected final void setInstanceType(InstanceType newInstanceType)
+	protected void setInstanceType(InstanceType newInstanceType)
 	{
 		_instanceType = newInstanceType;
 	}
@@ -736,7 +736,7 @@ public abstract class WorldObject extends ListenersContainer implements IIdentif
 	 * @param instance the instance to update
 	 * @param hide if {@code true} hide the player
 	 */
-	private final void sendInstanceUpdate(Instance instance, boolean hide)
+	private void sendInstanceUpdate(Instance instance, boolean hide)
 	{
 		final int startTime = (int) ((System.currentTimeMillis() - instance.getInstanceStartTime()) / 1000);
 		final int endTime = (int) ((instance.getInstanceEndTime() - instance.getInstanceStartTime()) / 1000);
@@ -326,7 +326,7 @@ public class Attackable extends Npc
 		return true;
 	}
 	
-	static class PartyContainer
+	private static class PartyContainer
 	{
 		public Party party;
 		public long damage;
@@ -2983,7 +2983,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 		return _isRunning;
 	}
 	
-	private final void setRunning(boolean value)
+	private void setRunning(boolean value)
 	{
 		if (_isRunning == value)
 		{
@@ -3153,7 +3153,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 	 * When a new instance of Creature is spawned, server just create a link between the instance and the template This link is stored in <b>_template</b>.
 	 * @param template
 	 */
-	protected final void setTemplate(CreatureTemplate template)
+	protected void setTemplate(CreatureTemplate template)
 	{
 		_template = template;
 	}
@@ -1517,7 +1517,7 @@ public class Npc extends Creature
 	}
 	
 	@Override
-	protected final void notifyQuestEventSkillFinished(Skill skill, WorldObject target)
+	protected void notifyQuestEventSkillFinished(Skill skill, WorldObject target)
 	{
 		if ((target != null) && target.isPlayable() && EventDispatcher.getInstance().hasListener(EventType.ON_NPC_SKILL_FINISHED, this))
 		{
@@ -14075,7 +14075,7 @@ public class Player extends Playable
 	 * Add a skill level to the custom skills map.
 	 * @param skill the skill to add
 	 */
-	private final void addCustomSkill(Skill skill)
+	private void addCustomSkill(Skill skill)
 	{
 		if ((skill == null) || (skill.getDisplayId() == skill.getId()))
 		{
@@ -14092,7 +14092,7 @@ public class Player extends Playable
 	 * Remove a skill level from the custom skill map.
 	 * @param skill the skill to remove
 	 */
-	private final void removeCustomSkill(Skill skill)
+	private void removeCustomSkill(Skill skill)
 	{
 		if ((skill != null) && (_customSkills != null) && (skill.getDisplayId() != skill.getId()))
 		{
@@ -184,7 +184,7 @@ public class BabyPet extends Pet
 		}
 	}
 	
-	private final void startCastTask()
+	private void startCastTask()
 	{
 		if ((_majorHeal != null) || (_buffs != null) || ((_recharge != null) && (_castTask == null) && !isDead()))
 		{
@@ -207,7 +207,7 @@ public class BabyPet extends Pet
 		return _bufferMode;
 	}
 	
-	private final void stopCastTask()
+	private void stopCastTask()
 	{
 		if (_castTask != null)
 		{
@@ -33,7 +33,7 @@ public class CastleDoorman extends Doorman
 	}
 	
 	@Override
-	protected final void openDoors(Player player, String command)
+	protected void openDoors(Player player, String command)
 	{
 		final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
 		st.nextToken();
@@ -52,7 +52,7 @@ public class CastleDoorman extends Doorman
 	}
 	
 	@Override
-	protected final void closeDoors(Player player, String command)
+	protected void closeDoors(Player player, String command)
 	{
 		final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
 		st.nextToken();
@@ -167,7 +167,7 @@ public class ClanHallDoorman extends Doorman
 	}
 	
 	@Override
-	protected final void openDoors(Player player, String command)
+	protected void openDoors(Player player, String command)
 	{
 		getClanHall().openCloseDoors(true);
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
@@ -177,7 +177,7 @@ public class ClanHallDoorman extends Doorman
 	}
 	
 	@Override
-	protected final void closeDoors(Player player, String command)
+	protected void closeDoors(Player player, String command)
 	{
 		getClanHall().openCloseDoors(false);
 		final NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
@@ -301,7 +301,7 @@ public class ControllableAirShip extends AirShip
 		}
 	}
 	
-	protected final class ConsumeFuelTask implements Runnable
+	protected class ConsumeFuelTask implements Runnable
 	{
 		@Override
 		public void run()
@@ -321,7 +321,7 @@ public class ControllableAirShip extends AirShip
 		}
 	}
 	
-	protected final class CheckTask implements Runnable
+	protected class CheckTask implements Runnable
 	{
 		@Override
 		public void run()
@@ -334,7 +334,7 @@ public class ControllableAirShip extends AirShip
 		}
 	}
 	
-	protected final class DecayTask implements Runnable
+	protected class DecayTask implements Runnable
 	{
 		@Override
 		public void run()
@@ -60,7 +60,7 @@ public class FortDoorman extends Doorman
 	}
 	
 	@Override
-	protected final void openDoors(Player player, String command)
+	protected void openDoors(Player player, String command)
 	{
 		final StringTokenizer st = new StringTokenizer(command.substring(10), ", ");
 		st.nextToken();
@@ -72,7 +72,7 @@ public class FortDoorman extends Doorman
 	}
 	
 	@Override
-	protected final void closeDoors(Player player, String command)
+	protected void closeDoors(Player player, String command)
 	{
 		final StringTokenizer st = new StringTokenizer(command.substring(11), ", ");
 		st.nextToken();
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
 /**
 * @author Forsaiken
 */
-final class BuilderContainer extends Builder
+public class BuilderContainer extends Builder
 {
 	private final Builder[] _builders;
 	
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
 /**
 * @author Forsaiken
 */
-final class BuilderObject extends Builder
+public class BuilderObject extends Builder
 {
 	private final int _index;
 	
@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.clientstrings;
 /**
 * @author Forsaiken
 */
-final class BuilderText extends Builder
+public class BuilderText extends Builder
 {
 	private final String _text;
 	
@@ -217,12 +217,12 @@ public class ItemAuction
 		return lastBid;
 	}
 	
-	private final void updatePlayerBid(ItemAuctionBid bid, boolean delete)
+	private void updatePlayerBid(ItemAuctionBid bid, boolean delete)
 	{
 		updatePlayerBidInternal(bid, delete);
 	}
 	
-	final void updatePlayerBidInternal(ItemAuctionBid bid, boolean delete)
+	private void updatePlayerBidInternal(ItemAuctionBid bid, boolean delete)
 	{
 		final String query = delete ? DELETE_ITEM_AUCTION_BID : INSERT_ITEM_AUCTION_BID;
 		try (Connection con = DatabaseFactory.getConnection();
@@ -323,7 +323,7 @@ public class ItemAuction
 		}
 	}
 	
-	private final void onPlayerBid(Player player, ItemAuctionBid bid)
+	private void onPlayerBid(Player player, ItemAuctionBid bid)
 	{
 		if (_highestBid == null)
 		{
@@ -509,7 +509,7 @@ public class ItemAuction
 		return false;
 	}
 	
-	private final void increaseItemCount(Player player, long count)
+	private void increaseItemCount(Player player, long count)
 	{
 		player.addAdena("ItemAuction", count, player, true);
 	}
@@ -43,22 +43,22 @@ public class ItemAuctionBid
 		return _lastBid;
 	}
 	
-	final void setLastBid(long lastBid)
+	public void setLastBid(long lastBid)
 	{
 		_lastBid = lastBid;
 	}
 	
-	final void cancelBid()
+	public void cancelBid()
 	{
 		_lastBid = -1;
 	}
 	
-	final boolean isCanceled()
+	public boolean isCanceled()
 	{
 		return _lastBid <= 0;
 	}
 	
-	final Player getPlayer()
+	public Player getPlayer()
 	{
 		return World.getInstance().getPlayer(_playerObjId);
 	}
@@ -231,7 +231,7 @@ public class ItemAuctionInstance
 		return null;
 	}
 	
-	final void checkAndSetCurrentAndNextAuction()
+	private void checkAndSetCurrentAndNextAuction()
 	{
 		final ItemAuction[] auctions = _auctions.values().toArray(new ItemAuction[_auctions.size()]);
 		
@@ -369,7 +369,7 @@ public class ItemAuctionInstance
 		return auctions;
 	}
 	
-	private final class ScheduleAuctionTask implements Runnable
+	private class ScheduleAuctionTask implements Runnable
 	{
 		private final ItemAuction _auction;
 		
@@ -391,7 +391,7 @@ public class ItemAuctionInstance
 			}
 		}
 		
-		private final void runImpl() throws Exception
+		private void runImpl() throws Exception
 		{
 			final ItemAuctionState state = _auction.getAuctionState();
 			switch (state)
@@ -469,7 +469,7 @@ public class ItemAuctionInstance
 		}
 	}
 	
-	final void onAuctionFinished(ItemAuction auction)
+	private void onAuctionFinished(ItemAuction auction)
 	{
 		auction.broadcastToAllBiddersInternal(new SystemMessage(SystemMessageId.S1_S_AUCTION_HAS_ENDED).addInt(auction.getAuctionId()));
 		
@@ -504,7 +504,7 @@ public class ItemAuctionInstance
 		}
 	}
 	
-	final void setStateTask(ScheduledFuture<?> future)
+	private void setStateTask(ScheduledFuture<?> future)
 	{
 		final ScheduledFuture<?> stateTask = _stateTask;
 		if (stateTask != null)
@@ -109,7 +109,7 @@ public abstract class Inventory extends ItemContainer
 	private int _wearedMask;
 	
 	// Recorder of alterations in inventory
-	private static final class ChangeRecorder implements PaperdollListener
+	private static class ChangeRecorder implements PaperdollListener
 	{
 		private final Inventory _inventory;
 		private final List<Item> _changed = new ArrayList<>(1);
@@ -158,7 +158,7 @@ public abstract class Inventory extends ItemContainer
 		}
 	}
 	
-	private static final class BowCrossRodListener implements PaperdollListener
+	private static class BowCrossRodListener implements PaperdollListener
 	{
 		private static BowCrossRodListener instance = new BowCrossRodListener();
 		
@@ -228,7 +228,7 @@ public abstract class Inventory extends ItemContainer
 		}
 	}
 	
-	private static final class StatsListener implements PaperdollListener
+	private static class StatsListener implements PaperdollListener
 	{
 		private static StatsListener instance = new StatsListener();
 		
@@ -250,7 +250,7 @@ public abstract class Inventory extends ItemContainer
 		}
 	}
 	
-	private static final class ItemSkillsListener implements PaperdollListener
+	private static class ItemSkillsListener implements PaperdollListener
 	{
 		private static ItemSkillsListener instance = new ItemSkillsListener();
 		
@@ -459,7 +459,7 @@ public abstract class Inventory extends ItemContainer
 		}
 	}
 	
-	private static final class ArmorSetListener implements PaperdollListener
+	private static class ArmorSetListener implements PaperdollListener
 	{
 		private static ArmorSetListener instance = new ArmorSetListener();
 		
@@ -700,7 +700,7 @@ public abstract class Inventory extends ItemContainer
 		}
 	}
 	
-	private static final class BraceletListener implements PaperdollListener
+	private static class BraceletListener implements PaperdollListener
 	{
 		private static BraceletListener instance = new BraceletListener();
 		
@@ -87,7 +87,7 @@ public abstract class AbstractOlympiadGame
 		return !_aborted;
 	}
 	
-	protected final void addPointsToParticipant(Participant par, int points)
+	protected void addPointsToParticipant(Participant par, int points)
 	{
 		par.updateStat(POINTS, points);
 		final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_EARNED_S2_POINTS_IN_THE_GRAND_OLYMPIAD_GAMES);
@@ -96,7 +96,7 @@ public abstract class AbstractOlympiadGame
 		broadcastPacket(sm);
 	}
 	
-	protected final void removePointsFromParticipant(Participant par, int points)
+	protected void removePointsFromParticipant(Participant par, int points)
 	{
 		par.updateStat(POINTS, -points);
 		final SystemMessage sm = new SystemMessage(SystemMessageId.C1_HAS_LOST_S2_POINTS_IN_THE_GRAND_OLYMPIAD_GAMES);
@@ -83,7 +83,7 @@ public class OlympiadGameManager implements Runnable
 		return _battleStarted;
 	}
 	
-	protected final void startBattle()
+	protected void startBattle()
 	{
 		_battleStarted = true;
 	}
@@ -119,7 +119,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void broadcastPacket(ServerPacket packet)
+	protected void broadcastPacket(ServerPacket packet)
 	{
 		if (_playerOne.updatePlayer())
 		{
@@ -156,7 +156,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void removals()
+	protected void removals()
 	{
 		if (_aborted)
 		{
@@ -183,7 +183,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void cleanEffects()
+	protected void cleanEffects()
 	{
 		if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumID))
 		{
@@ -197,7 +197,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void portPlayersBack()
+	protected void portPlayersBack()
 	{
 		if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected())
 		{
@@ -210,7 +210,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void playersStatusBack()
+	protected void playersStatusBack()
 	{
 		if ((_playerOne.getPlayer() != null) && !_playerOne.isDefaulted() && !_playerOne.isDisconnected() && (_playerOne.getPlayer().getOlympiadGameId() == _stadiumID))
 		{
@@ -224,7 +224,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void clearPlayers()
+	protected void clearPlayers()
 	{
 		_playerOne.setPlayer(null);
 		_playerOne = null;
@@ -233,7 +233,7 @@ public abstract class OlympiadGameNormal extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void handleDisconnect(Player player)
+	protected void handleDisconnect(Player player)
 	{
 		if (player.getObjectId() == _playerOne.getObjectId())
 		{
@@ -381,7 +381,7 @@ public class OlympiadGameTask implements Runnable
 	/**
 	 * Third stage: open doors.
 	 */
-	private final void openDoors()
+	private void openDoors()
 	{
 		try
 		{
@@ -258,7 +258,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void broadcastPacket(ServerPacket packet)
+	protected void broadcastPacket(ServerPacket packet)
 	{
 		Participant par;
 		for (int i = 0; i < _teamOneSize; i++)
@@ -316,7 +316,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void removals()
+	protected void removals()
 	{
 		for (int i = _teamOneSize; --i >= 0;)
 		{
@@ -365,7 +365,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void cleanEffects()
+	protected void cleanEffects()
 	{
 		Participant par;
 		for (int i = _teamOneSize; --i >= 0;)
@@ -388,7 +388,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void portPlayersBack()
+	protected void portPlayersBack()
 	{
 		Participant par;
 		for (int i = _teamOneSize; --i >= 0;)
@@ -411,7 +411,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void playersStatusBack()
+	protected void playersStatusBack()
 	{
 		Participant par;
 		for (int i = _teamOneSize; --i >= 0;)
@@ -434,7 +434,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void clearPlayers()
+	protected void clearPlayers()
 	{
 		for (int i = 0; i < MAX_TEAM_SIZE; i++)
 		{
@@ -462,7 +462,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	}
 	
 	@Override
-	protected final void handleDisconnect(Player player)
+	protected void handleDisconnect(Player player)
 	{
 		Participant par;
 		for (int i = _teamOneSize; --i >= 0;)
@@ -962,7 +962,7 @@ public class OlympiadGameTeams extends AbstractOlympiadGame
 	 * UnAfraid: TODO: We should calculate the damage in array separately for each player so we can display it on ExOlympiadMatchResult correctly.
 	 */
 	@Override
-	protected final void addDamage(Player player, int damage)
+	protected void addDamage(Player player, int damage)
 	{
 		Participant par;
 		for (int i = _teamOneSize; --i >= 0;)
@@ -98,7 +98,7 @@ public class OlympiadManager
 		return _teamsBasedRegisters.size() >= Config.ALT_OLY_TEAMS;
 	}
 	
-	protected final void clearRegistered()
+	protected void clearRegistered()
 	{
 		_nonClassBasedRegisters.clear();
 		_classBasedRegisters.clear();
@@ -539,7 +539,7 @@ public class OlympiadManager
 		return true;
 	}
 	
-	private static final class AnnounceUnregToTeam implements Runnable
+	private static class AnnounceUnregToTeam implements Runnable
 	{
 		private final List<Integer> _team;
 		
@@ -200,7 +200,7 @@ public class Options
 		player.sendSkillList();
 	}
 	
-	private final void addSkill(Player player, Skill skill)
+	private void addSkill(Player player, Skill skill)
 	{
 		boolean updateTimeStamp = false;
 		player.addSkill(skill, false);
@@ -105,7 +105,7 @@ public class AuctionableHall extends ClanHall
 	 * Initialize Fee Task
 	 * @param forced
 	 */
-	private final void initialyzeTask(boolean forced)
+	private void initialyzeTask(boolean forced)
 	{
 		final long currentTime = System.currentTimeMillis();
 		if (_paidUntil > currentTime)
@@ -171,7 +171,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		}
 	}
 	
-	private final void spawnSiegeGuards()
+	private void spawnSiegeGuards()
 	{
 		for (Spawn guard : _guards)
 		{
@@ -183,7 +183,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
 		}
 	}
 	
-	private final void unSpawnSiegeGuards()
+	private void unSpawnSiegeGuards()
 	{
 		if (_guards != null)
 		{
@@ -90,7 +90,7 @@ public enum BaseStat
 		throw new NoSuchElementException("Unknown name '" + internName + "' for enum BaseStats");
 	}
 	
-	protected static final class STR implements IBaseStatFunction
+	protected static class STR implements IBaseStatFunction
 	{
 		@Override
 		public double calcBonus(Creature actor)
@@ -99,7 +99,7 @@ public enum BaseStat
 		}
 	}
 	
-	protected static final class INT implements IBaseStatFunction
+	protected static class INT implements IBaseStatFunction
 	{
 		@Override
 		public double calcBonus(Creature actor)
@@ -108,7 +108,7 @@ public enum BaseStat
 		}
 	}
 	
-	protected static final class DEX implements IBaseStatFunction
+	protected static class DEX implements IBaseStatFunction
 	{
 		@Override
 		public double calcBonus(Creature actor)
@@ -117,7 +117,7 @@ public enum BaseStat
 		}
 	}
 	
-	protected static final class WIT implements IBaseStatFunction
+	protected static class WIT implements IBaseStatFunction
 	{
 		@Override
 		public double calcBonus(Creature actor)
@@ -126,7 +126,7 @@ public enum BaseStat
 		}
 	}
 	
-	protected static final class CON implements IBaseStatFunction
+	protected static class CON implements IBaseStatFunction
 	{
 		@Override
 		public double calcBonus(Creature actor)
@@ -135,7 +135,7 @@ public enum BaseStat
 		}
 	}
 	
-	protected static final class MEN implements IBaseStatFunction
+	protected static class MEN implements IBaseStatFunction
 	{
 		@Override
 		public double calcBonus(Creature actor)
@@ -144,7 +144,7 @@ public enum BaseStat
 		}
 	}
 	
-	protected static final class NONE implements IBaseStatFunction
+	protected static class NONE implements IBaseStatFunction
 	{
 		@Override
 		public double calcBonus(Creature actor)
@@ -48,7 +48,7 @@ public abstract class ZoneForm
 	
 	public abstract void visualizeZone(int z);
 	
-	protected final void dropDebugItem(int itemId, int num, int x, int y, int z)
+	protected void dropDebugItem(int itemId, int num, int x, int y, int z)
 	{
 		final Item item = new Item(IdManager.getInstance().getNextId(), itemId);
 		item.setCount(num);
@@ -193,7 +193,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
 	}
 	
 	@Override
-	protected final void onEnter(Creature creature)
+	protected void onEnter(Creature creature)
 	{
 		if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
 		{
@@ -229,7 +229,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
 	}
 	
 	@Override
-	protected final void onExit(Creature creature)
+	protected void onExit(Creature creature)
 	{
 		if ((getSettings().getOlympiadTask() != null) && getSettings().getOlympiadTask().isBattleStarted())
 		{
@@ -283,7 +283,7 @@ public class OlympiadStadiumZone extends ZoneRespawn
 		}
 	}
 	
-	private static final class KickPlayer implements Runnable
+	private static class KickPlayer implements Runnable
 	{
 		private Player _player;
 		
@@ -17970,7 +17970,7 @@ public class NpcStringId
 		return _id;
 	}
 	
-	private final void setName(String name)
+	private void setName(String name)
 	{
 		_name = name;
 	}
@@ -18054,7 +18054,7 @@ public class NpcStringId
 		return "NS[" + getId() + ":" + getName() + "]";
 	}
 	
-	public static final class NSLocalisation
+	public static class NSLocalisation
 	{
 		private final String _lang;
 		private final Builder _builder;
@@ -10012,7 +10012,7 @@ public class SystemMessageId
 		return "SM[" + getId() + ":" + getName() + "]";
 	}
 	
-	public static final class SMLocalisation
+	public static class SMLocalisation
 	{
 		private final String _lang;
 		private final Builder _builder;
--- a/Show More
+++ b/Show More