BETA: Misc fixes:

	* Addressing the "synthetic access" problem.
		* When using nested classes, JVM would create a "synthetic class" (dynamic proxy) with the accessors to access its fields.
			* To that add the overhead that suppose using accessors (getters for fields) instead of direct access (pointed out by BiggBoss at forums).
			* This can be fixed in different ways, I have chosen to change the visibility of some fields, classes and methods to make them visible from outer classes instead of adding public/protected accesors.
				* This should avoid the creation of this synthetic classes and avoid adding accessors to simple holders (DTOs).
	* Reverting synchronization overhead at Point3D, since it uses "cheap read-write lock" trick, thanks tukune for report.
		* [http://www.ibm.com/developerworks/java/library/j-jtp06197/index.html#3.1 The cheap read-write lock trick]
	* Revering some minor things in Action packet, no in-game visible changes.
	* Fixed typo at FaenorScriptEngine, thanks nonom for report.
	* Avoiding FastMap in AbstractRefinePacket where synchronization is not required, using the direct field access instead of the getter for the calls inside the same class.

'''Note:''' For those who get warnings after the eclipse preference changes, use the support area to ask for help fixing them.

L2J_Server_BETA/.settings/org.eclipse.jdt.core.prefs

@@ -69,7 +69,7 @@ org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
 org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
 org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
 org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
@@ -110,7 +110,7 @@ org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=53
 org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=0
 org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=48

L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -3004,10 +3004,13 @@ public final class Config
 				throw new Error("Failed to Load " + GRACIASEEDS_CONFIG_FILE + " File.");
 			}
 			
-			try
+			final File chat_filter = new File(CHAT_FILTER_FILE);
+			try (FileReader fr = new FileReader(chat_filter);
+				BufferedReader br = new BufferedReader(fr);
+				LineNumberReader lnr = new LineNumberReader(br))
 			{
 				FILTER_LIST = new ArrayList<String>();
-				LineNumberReader lnr = new LineNumberReader(new BufferedReader(new FileReader(new File(CHAT_FILTER_FILE))));
+				
 				String line = null;
 				while ((line = lnr.readLine()) != null)
 				{

L2J_Server_BETA/java/com/l2jserver/L2DatabaseFactory.java

@@ -285,6 +285,8 @@ public class L2DatabaseFactory
 	 */
 	private static class ConnectionCloser implements Runnable
 	{
+		private static final Logger _log = Logger.getLogger(ConnectionCloser.class.getName());
+		
 		/** The connection. */
 		private final Connection c;
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/Announcements.java

@@ -52,7 +52,7 @@ public class Announcements
 	private List<String> _critAnnouncements = new FastList<String>();
 	private List<List<Object>> _eventAnnouncements = new FastList<List<Object>>();
 	
-	private Announcements()
+	protected Announcements()
 	{
 		loadAnnouncements();
 	}
@@ -173,28 +173,23 @@ public class Announcements
 	private void readFromDisk(String path, List<String> list)
 	{
 		final File file = new File(Config.DATAPACK_ROOT, path);
-		if (file.exists())
+		try (FileReader fr = new FileReader(file);
+			LineNumberReader lnr = new LineNumberReader(fr))
 		{
-			
-			try (LineNumberReader lnr = new LineNumberReader(new FileReader(file)))
+			String line = null;
+			while ((line = lnr.readLine()) != null)
 			{
-				String line = null;
-				while ((line = lnr.readLine()) != null)
+				StringTokenizer st = new StringTokenizer(line, "\n\r");
+				if (st.hasMoreTokens())
 				{
-					StringTokenizer st = new StringTokenizer(line, "\n\r");
-					if (st.hasMoreTokens())
-					{
-						list.add(st.nextToken());
-					}
+					list.add(st.nextToken());
 				}
 			}
-			catch (IOException e1)
-			{
-				_log.log(Level.SEVERE, "Error reading announcements: ", e1);
-			}
 		}
-		else
-			_log.warning(file.getAbsolutePath() + " doesn't exist");
+		catch (IOException e1)
+		{
+			_log.log(Level.SEVERE, "Error reading announcements: ", e1);
+		}
 	}
 	
 	private void saveToDisk(boolean isCritical)
@@ -270,7 +265,6 @@ public class Announcements
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final Announcements _instance = new Announcements();

L2J_Server_BETA/java/com/l2jserver/gameserver/GameTimeController.java

@@ -43,7 +43,7 @@ public class GameTimeController
 	protected static boolean _isNight = false;
 	protected static boolean _interruptRequest = false;
 	
-	private static final TIntObjectHashMap<L2Character> _movingObjects = new TIntObjectHashMap<L2Character>();
+	protected static final TIntObjectHashMap<L2Character> _movingObjects = new TIntObjectHashMap<L2Character>();
 	private static final ReentrantLock _lock = new ReentrantLock();
 	
 	protected static TimerThread _timer;
@@ -57,7 +57,7 @@ public class GameTimeController
 		return SingletonHolder._instance;
 	}
 	
-	private GameTimeController()
+	protected GameTimeController()
 	{
 		_gameStartTime = System.currentTimeMillis() - 3600000; // offset so that the server starts a day begin
 		_gameTicks = 3600000 / MILLIS_IN_TICK; // offset so that the server starts a day begin
@@ -134,7 +134,7 @@ public class GameTimeController
 		}
 	}
 	
-	private final class MoveObjects implements TObjectProcedure<L2Character>
+	protected final class MoveObjects implements TObjectProcedure<L2Character>
 	{
 		@Override
 		public final boolean execute(final L2Character ch)
@@ -259,7 +259,6 @@ public class GameTimeController
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final GameTimeController _instance = new GameTimeController();

L2J_Server_BETA/java/com/l2jserver/gameserver/GeoData.java

@@ -34,7 +34,7 @@ public class GeoData
 	{
 	}
 	
-	private GeoData(final boolean disabled)
+	protected GeoData(final boolean disabled)
 	{
 		if (disabled)
 		{
@@ -188,7 +188,6 @@ public class GeoData
 		return false;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final GeoData _instance = Config.GEODATA > 0 ? GeoEngine.getInstance() : new GeoData(true);

L2J_Server_BETA/java/com/l2jserver/gameserver/GeoEngine.java

@@ -64,24 +64,18 @@ public class GeoEngine extends GeoData
 		return SingletonHolder._instance;
 	}
 	
-	private GeoEngine()
+	protected GeoEngine()
 	{
 		nInitGeodata();
 	}
 	
 	//Public Methods
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#getType(int, int)
-	 */
 	@Override
 	public short getType(int x, int y)
 	{
 		return nGetType((x - L2World.MAP_MIN_X) >> 4, (y - L2World.MAP_MIN_Y) >> 4);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#getHeight(int, int, int)
-	 */
 	@Override
 	public short getHeight(int x, int y, int z)
 	{
@@ -94,9 +88,6 @@ public class GeoEngine extends GeoData
 		return nGetSpawnHeight((x - L2World.MAP_MIN_X) >> 4, (y - L2World.MAP_MIN_Y) >> 4, zmin, zmax, spawn);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#geoPosition(int, int)
-	 */
 	@Override
 	public String geoPosition(int x, int y)
 	{
@@ -106,9 +97,6 @@ public class GeoEngine extends GeoData
 		+ getRegionOffset(gx, gy);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#canSeeTarget(L2Object, Point3D)
-	 */
 	@Override
 	public boolean canSeeTarget(L2Object cha, Point3D target)
 	{
@@ -119,9 +107,6 @@ public class GeoEngine extends GeoData
 		return canSeeTarget(target.getX(), target.getY(), target.getZ(), cha.getX(), cha.getY(), cha.getZ());
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#canSeeTarget(com.l2jserver.gameserver.model.L2Object, com.l2jserver.gameserver.model.L2Object)
-	 */
 	@Override
 	public boolean canSeeTarget(L2Object cha, L2Object target)
 	{
@@ -152,9 +137,6 @@ public class GeoEngine extends GeoData
 		return canSeeTarget(target.getX(), target.getY(), z2, cha.getX(), cha.getY(), z);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#canSeeTargetDebug(com.l2jserver.gameserver.model.actor.instance.L2PcInstance, com.l2jserver.gameserver.model.L2Object)
-	 */
 	@Override
 	public boolean canSeeTargetDebug(L2PcInstance gm, L2Object target)
 	{
@@ -172,9 +154,6 @@ public class GeoEngine extends GeoData
 		return canSeeDebug(gm, (target.getX() - L2World.MAP_MIN_X) >> 4, (target.getY() - L2World.MAP_MIN_Y) >> 4, z2, (gm.getX() - L2World.MAP_MIN_X) >> 4, (gm.getY() - L2World.MAP_MIN_Y) >> 4, z);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#getNSWE(int, int, int)
-	 */
 	@Override
 	public short getNSWE(int x, int y, int z)
 	{
@@ -188,9 +167,6 @@ public class GeoEngine extends GeoData
 		return (destiny.getX() == tx && destiny.getY() == ty && destiny.getZ() == tz);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#moveCheck(int, int, int, int, int, int, int)
-	 */
 	@Override
 	public Location moveCheck(int x, int y, int z, int tx, int ty, int tz, int instanceId)
 	{
@@ -202,9 +178,6 @@ public class GeoEngine extends GeoData
 		return moveCheck(startpoint, destiny, (x - L2World.MAP_MIN_X) >> 4, (y - L2World.MAP_MIN_Y) >> 4, z, (tx - L2World.MAP_MIN_X) >> 4, (ty - L2World.MAP_MIN_Y) >> 4, tz);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.GeoData#addGeoDataBug(com.l2jserver.gameserver.model.actor.instance.L2PcInstance, java.lang.String)
-	 */
 	@Override
 	public void addGeoDataBug(L2PcInstance gm, String comment)
 	{
@@ -489,8 +462,17 @@ public class GeoEngine extends GeoData
 		return true;
 	}
 	
-	/*
+	/**
 	 *  MoveCheck
+	 * @param startpoint 
+	 * @param destiny 
+	 * @param x 
+	 * @param y 
+	 * @param z 
+	 * @param tx 
+	 * @param ty 
+	 * @param tz 
+	 * @return 
 	 */
 	private static Location moveCheck(Location startpoint, Location destiny, int x, int y, double z, int tx, int ty, int tz)
 	{
@@ -628,24 +610,13 @@ public class GeoEngine extends GeoData
 	//GeoEngine
 	private static void nInitGeodata()
 	{
-		LineNumberReader lnr = null;
-		try
+		final File file = new File("./data/geodata/geo_index.txt");
+		try (FileReader fr = new FileReader(file);
+			BufferedReader br = new BufferedReader(fr);
+			LineNumberReader lnr = new LineNumberReader(br))
 		{
 			_log.info("Geo Engine: - Loading Geodata...");
-			File Data = new File("./data/geodata/geo_index.txt");
-			if (!Data.exists())
-				return;
-			
-			lnr = new LineNumberReader(new BufferedReader(new FileReader(Data)));
-		}
-		catch (Exception e)
-		{
-			_log.log(Level.WARNING, "", e);
-			throw new Error("Failed to Load geo_index File.");
-		}
-		String line;
-		try
-		{
+			String line;
 			while ((line = lnr.readLine()) != null)
 			{
 				if (line.trim().length() == 0)
@@ -661,16 +632,7 @@ public class GeoEngine extends GeoData
 			_log.log(Level.WARNING, "", e);
 			throw new Error("Failed to Read geo_index File.");
 		}
-		finally
-		{
-			try
-			{
-				lnr.close();
-			}
-			catch (Exception e)
-			{
-			}
-		}
+		
 		try
 		{
 			File geo_bugs = new File("./data/geodata/geo_bugs.txt");
@@ -1516,7 +1478,6 @@ public class GeoEngine extends GeoData
 		return true;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final GeoEngine _instance = new GeoEngine();

L2J_Server_BETA/java/com/l2jserver/gameserver/ItemsAutoDestroy.java

@@ -32,7 +32,7 @@ public class ItemsAutoDestroy
 	protected List<L2ItemInstance> _items = null;
 	protected static long _sleep;
 	
-	private ItemsAutoDestroy()
+	protected ItemsAutoDestroy()
 	{
 		_log.info("Initializing ItemsAutoDestroy.");
 		_items = new FastList<L2ItemInstance>();
@@ -114,7 +114,6 @@ public class ItemsAutoDestroy
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ItemsAutoDestroy _instance = new ItemsAutoDestroy();

L2J_Server_BETA/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -114,7 +114,7 @@ public class LoginServerThread extends Thread
 	private final String[] _subnets;
 	private final String[] _hosts;
 	
-	private LoginServerThread()
+	protected LoginServerThread()
 	{
 		super("LoginServerThread");
 		_port = Config.GAME_SERVER_LOGIN_PORT;
@@ -760,7 +760,6 @@ public class LoginServerThread extends Thread
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final LoginServerThread _instance = new LoginServerThread();

L2J_Server_BETA/java/com/l2jserver/gameserver/MonsterRace.java

@@ -34,7 +34,7 @@ public class MonsterRace
 	private int[][] _speeds;
 	private int[] _first, _second;
 	
-	private MonsterRace()
+	protected MonsterRace()
 	{
 		_monsters = new L2Npc[8];
 		_speeds = new int[8][20];
@@ -141,7 +141,6 @@ public class MonsterRace
 		return _second[0];
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final MonsterRace _instance = new MonsterRace();

L2J_Server_BETA/java/com/l2jserver/gameserver/RecipeController.java

@@ -66,7 +66,7 @@ public class RecipeController
 	protected static final Logger _log = Logger.getLogger(RecipeController.class.getName());
 	
 	private static final Map<Integer, L2RecipeList> _lists = new FastMap<Integer, L2RecipeList>();
-	private static final Map<Integer, RecipeItemMaker> _activeMakers = new FastMap<Integer, RecipeItemMaker>().shared();
+	protected static final Map<Integer, RecipeItemMaker> _activeMakers = new FastMap<Integer, RecipeItemMaker>().shared();
 	private static final String RECIPES_FILE = "recipes.xml";
 	
 	public static RecipeController getInstance()
@@ -74,7 +74,7 @@ public class RecipeController
 		return SingletonHolder._instance;
 	}
 	
-	private RecipeController()
+	protected RecipeController()
 	{
 		try
 		{
@@ -1015,7 +1015,6 @@ public class RecipeController
 		return recipeList;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final RecipeController _instance = new RecipeController();

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

@@ -125,7 +125,7 @@ public class SevenSigns
 	protected int _previousWinner;
 	protected Calendar _lastSave = Calendar.getInstance();
 	
-	private Map<Integer, StatsSet> _signsPlayerData;
+	protected Map<Integer, StatsSet> _signsPlayerData;
 	
 	private Map<Integer, Integer> _signsSealOwners;
 	private Map<Integer, Integer> _signsDuskSealTotals;
@@ -162,7 +162,7 @@ public class SevenSigns
 		"festival_cycle=?, accumulated_bonus0=?, accumulated_bonus1=?, accumulated_bonus2=?," +
 		"accumulated_bonus3=?, accumulated_bonus4=?, date=? WHERE id=0";
 	
-	private SevenSigns()
+	protected SevenSigns()
 	{
 		_signsPlayerData = new FastMap<Integer, StatsSet>();
 		_signsSealOwners = new FastMap<Integer, Integer>();
@@ -1361,22 +1361,20 @@ public class SevenSigns
 	}
 	
 	/**
-	 * This method is called to remove all players from catacombs and
-	 * necropolises, who belong to the losing cabal.
-	 * <BR><BR>
+	 * This method is called to remove all players from catacombs and necropolises, who belong to the losing cabal.<br>
 	 * Should only ever called at the beginning of Seal Validation.
 	 * @param compWinner 
 	 */
 	protected void teleLosingCabalFromDungeons(String compWinner)
 	{
-		L2World.getInstance().forEachPlayer(new teleLosingCabalFromDungeons(compWinner));
+		L2World.getInstance().forEachPlayer(new TeleLosingCabalFromDungeons(compWinner));
 	}
 	
-	private final class teleLosingCabalFromDungeons implements TObjectProcedure<L2PcInstance>
+	private final class TeleLosingCabalFromDungeons implements TObjectProcedure<L2PcInstance>
 	{
 		private final String _cmpWinner;
 		
-		private teleLosingCabalFromDungeons(final String compWinner)
+		protected TeleLosingCabalFromDungeons(final String compWinner)
 		{
 			_cmpWinner = compWinner;
 		}
@@ -1571,17 +1569,18 @@ public class SevenSigns
 	
 	public void giveCPMult(int StrifeOwner)
 	{
-		L2World.getInstance().forEachPlayer(new giveCPMult(StrifeOwner));
+		L2World.getInstance().forEachPlayer(new GiveCPMult(StrifeOwner));
 	}
 	
-	private final class giveCPMult implements TObjectProcedure<L2PcInstance>
+	private final class GiveCPMult implements TObjectProcedure<L2PcInstance>
 	{
 		private final int _strifeOwner;
 		
-		private giveCPMult(int strifeOwner)
+		protected GiveCPMult(int strifeOwner)
 		{
 			_strifeOwner = strifeOwner;
 		}
+		
 		@Override
 		public final boolean execute(final L2PcInstance character)
 		{
@@ -1596,17 +1595,16 @@ public class SevenSigns
 						//Gives "The Vanquished of War" passive skill to all online characters with Cabal, which does not control Seal of Strife
 						character.addSkill(SkillTable.FrequentSkill.THE_VANQUISHED_OF_WAR.getSkill());
 			}
-			
 			return true;
 		}
 	}
 	
 	public void removeCPMult()
 	{
-		L2World.getInstance().forEachPlayer(new removeCPMult());
+		L2World.getInstance().forEachPlayer(new RemoveCPMult());
 	}
 	
-	private final class removeCPMult implements TObjectProcedure<L2PcInstance>
+	protected final class RemoveCPMult implements TObjectProcedure<L2PcInstance>
 	{	
 		@Override
 		public final boolean execute(final L2PcInstance character)
@@ -1637,7 +1635,6 @@ public class SevenSigns
 		return false;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SevenSigns _instance = new SevenSigns();

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -62,12 +62,12 @@ import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
 /**
- *Seven Signs Festival of Darkness Engine
- *
- *TODO:
- *- Archer mobs should target healer characters over other party members.
- *- ADDED 29 Sep: Players that leave a party during the Seven Signs Festival will now take damage and cannot be healed.
- *
+ * Seven Signs Festival of Darkness Engine.<br>
+ * TODO:<br>
+ * <ul>
+ * <li>Archer mobs should target healer characters over other party members.</li>
+ * <li>Added 29 Sep: Players that leave a party during the Seven Signs Festival will now take damage and cannot be healed.</li>
+ * </ul>
  *@author Tempy
  */
 public class SevenSignsFestival implements SpawnListener
@@ -780,7 +780,7 @@ public class SevenSignsFestival implements SpawnListener
 	 */
 	private Map<Integer, Map<Integer, StatsSet>> _festivalData;
 	
-	private SevenSignsFestival()
+	protected SevenSignsFestival()
 	{
 		_accumulatedBonuses = new FastList<Integer>();
 		
@@ -2459,7 +2459,7 @@ public class SevenSignsFestival implements SpawnListener
 		}
 	}
 	
-	private final class ForEachPlayerRemoveUnusedBloodOfferings implements TObjectProcedure<L2PcInstance>
+	protected final class ForEachPlayerRemoveUnusedBloodOfferings implements TObjectProcedure<L2PcInstance>
 	{	
 		@Override
 		public final boolean execute(final L2PcInstance onlinePlayer)
@@ -2478,7 +2478,6 @@ public class SevenSignsFestival implements SpawnListener
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SevenSignsFestival _instance = new SevenSignsFestival();

L2J_Server_BETA/java/com/l2jserver/gameserver/Shutdown.java

@@ -144,10 +144,10 @@ public class Shutdown extends Thread
 	}
 	
 	/**
-	 * Default constucter is only used internal to create the shutdown-hook instance
+	 * Default constructor is only used internal to create the shutdown-hook instance
 	 *
 	 */
-	private Shutdown()
+	protected Shutdown()
 	{
 		_secondsShut = -1;
 		_shutdownMode = SIGTERM;
@@ -607,11 +607,13 @@ public class Shutdown extends Thread
 	 */
 	private void disconnectAllCharacters()
 	{
-		L2World.getInstance().getAllPlayers().safeForEachValue(new disconnectAllCharacters());
+		L2World.getInstance().getAllPlayers().safeForEachValue(new DisconnectAllCharacters());
 	}
 	
-	private final class disconnectAllCharacters implements TObjectProcedure<L2PcInstance>
+	protected final class DisconnectAllCharacters implements TObjectProcedure<L2PcInstance>
 	{
+		private final Logger _log = Logger.getLogger(DisconnectAllCharacters.class.getName());
+		
 		@Override
 		public final boolean execute(final L2PcInstance player)
 		{
@@ -647,30 +649,29 @@ public class Shutdown extends Thread
 	{
 		private long _startTime;
 		
-		private TimeCounter()
+		protected TimeCounter()
 		{
 			restartCounter();
 		}
 		
-		private void restartCounter()
+		protected void restartCounter()
 		{
 			_startTime = System.currentTimeMillis();
 		}
 		
-		private long getEstimatedTimeAndRestartCounter()
+		protected long getEstimatedTimeAndRestartCounter()
 		{
 			final long toReturn = System.currentTimeMillis() - _startTime;
 			restartCounter();
 			return toReturn;
 		}
 		
-		private long getEstimatedTime()
+		protected long getEstimatedTime()
 		{
 			return System.currentTimeMillis() - _startTime;
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final Shutdown _instance = new Shutdown();

L2J_Server_BETA/java/com/l2jserver/gameserver/Territory.java

@@ -36,7 +36,7 @@ public class Territory
 		return SingletonHolder._instance;
 	}
 	
-	private Territory()
+	protected Territory()
 	{
 		// load all data at server start
 		reload_data();
@@ -75,7 +75,6 @@ public class Territory
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final Territory _instance = new Territory();

L2J_Server_BETA/java/com/l2jserver/gameserver/ThreadPoolManager.java

@@ -95,9 +95,9 @@ public class ThreadPoolManager
 		}
 	}
 	
-	private ScheduledThreadPoolExecutor _effectsScheduledThreadPool;
-	private ScheduledThreadPoolExecutor _generalScheduledThreadPool;
-	private ScheduledThreadPoolExecutor _aiScheduledThreadPool;
+	protected ScheduledThreadPoolExecutor _effectsScheduledThreadPool;
+	protected ScheduledThreadPoolExecutor _generalScheduledThreadPool;
+	protected ScheduledThreadPoolExecutor _aiScheduledThreadPool;
 	private ThreadPoolExecutor _generalPacketsThreadPool;
 	private ThreadPoolExecutor _ioPacketsThreadPool;
 	private ThreadPoolExecutor _generalThreadPool;
@@ -113,7 +113,7 @@ public class ThreadPoolManager
 		return SingletonHolder._instance;
 	}
 	
-	private ThreadPoolManager()
+	protected ThreadPoolManager()
 	{
 		_effectsScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.THREAD_P_EFFECTS, new PriorityThreadFactory("EffectsSTPool", Thread.NORM_PRIORITY));
 		_generalScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.THREAD_P_GENERAL, new PriorityThreadFactory("GeneralSTPool", Thread.NORM_PRIORITY));
@@ -479,7 +479,7 @@ public class ThreadPoolManager
 		return sb.toString();
 	}
 	
-	private class PurgeTask implements Runnable
+	protected class PurgeTask implements Runnable
 	{
 		@Override
 		public void run()
@@ -490,7 +490,6 @@ public class ThreadPoolManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ThreadPoolManager _instance = new ThreadPoolManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/TradeController.java

@@ -69,7 +69,7 @@ public class TradeController
 		return SingletonHolder._instance;
 	}
 	
-	private TradeController()
+	protected TradeController()
 	{
 		_lists.clear();
 		Connection con = null;
@@ -345,7 +345,6 @@ public class TradeController
 		return _nextListId++;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final TradeController _instance = new TradeController();

L2J_Server_BETA/java/com/l2jserver/gameserver/cache/CrestCache.java

@@ -57,7 +57,7 @@ public class CrestCache
 		return SingletonHolder._instance;
 	}
 	
-	private CrestCache()
+	protected CrestCache()
 	{
 		convertOldPedgeFiles();
 		reload();
@@ -371,7 +371,6 @@ public class CrestCache
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CrestCache _instance = new CrestCache();

L2J_Server_BETA/java/com/l2jserver/gameserver/cache/HtmCache.java

@@ -46,7 +46,7 @@ public class HtmCache
 		return SingletonHolder._instance;
 	}
 	
-	private HtmCache()
+	protected HtmCache()
 	{
 		if (Config.LAZY_CACHE)
 		{
@@ -216,7 +216,6 @@ public class HtmCache
 		return htmlFilter.accept(new File(path));
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final HtmCache _instance = new HtmCache();

L2J_Server_BETA/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java

@@ -34,7 +34,7 @@ public class WarehouseCacheManager
 		return SingletonHolder._instance;
 	}
 	
-	private WarehouseCacheManager()
+	protected WarehouseCacheManager()
 	{
 		_cacheTime = Config.WAREHOUSE_CACHE_TIME * 60000L; // 60*1000 = 60000
 		_cachedWh = new FastMap<L2PcInstance, Long>().shared();
@@ -68,7 +68,6 @@ public class WarehouseCacheManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final WarehouseCacheManager _instance = new WarehouseCacheManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/CommunityBoard.java

@@ -27,10 +27,6 @@ import com.l2jserver.gameserver.network.serverpackets.ShowBoard;
 
 public class CommunityBoard
 {
-	private CommunityBoard()
-	{
-	}
-	
 	public static CommunityBoard getInstance()
 	{
 		return SingletonHolder._instance;
@@ -148,7 +144,6 @@ public class CommunityBoard
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CommunityBoard _instance = new CommunityBoard();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/AdminBBSManager.java

@@ -27,14 +27,6 @@ public class AdminBBSManager extends BaseBBSManager
 		return SingletonHolder._instance;
 	}
 	
-	private AdminBBSManager()
-	{
-	}
-	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.communitybbs.Manager.BaseBBSManager#parsecmd(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
-	 */
 	@Override
 	public void parsecmd(String command, L2PcInstance activeChar)
 	{
@@ -73,7 +65,6 @@ public class AdminBBSManager extends BaseBBSManager
 		
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final AdminBBSManager _instance = new AdminBBSManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/ClanBBSManager.java

@@ -24,10 +24,6 @@ import com.l2jserver.util.StringUtil;
 
 public class ClanBBSManager extends BaseBBSManager
 {
-	private ClanBBSManager()
-	{
-	}
-	
 	public static ClanBBSManager getInstance()
 	{
 		return SingletonHolder._instance;
@@ -278,7 +274,6 @@ public class ClanBBSManager extends BaseBBSManager
 		clanhome(activeChar, activeChar.getClan().getClanId());
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ClanBBSManager _instance = new ClanBBSManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java

@@ -41,7 +41,7 @@ public class ForumsBBSManager extends BaseBBSManager
 		return SingletonHolder._instance;
 	}
 	
-	private ForumsBBSManager()
+	protected ForumsBBSManager()
 	{
 		_table = new FastList<Forum>();
 		
@@ -157,7 +157,6 @@ public class ForumsBBSManager extends BaseBBSManager
 	{
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ForumsBBSManager _instance = new ForumsBBSManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java

@@ -34,7 +34,7 @@ public class PostBBSManager extends BaseBBSManager
 {
 	private Map<Topic, Post> _postByTopic;
 	
-	private PostBBSManager()
+	protected PostBBSManager()
 	{
 		_postByTopic = new FastMap<Topic, Post>();
 	}
@@ -327,7 +327,6 @@ public class PostBBSManager extends BaseBBSManager
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final PostBBSManager _instance = new PostBBSManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java

@@ -54,10 +54,6 @@ public class RegionBBSManager extends BaseBBSManager
 		}
 	};
 	
-	private RegionBBSManager()
-	{
-	}
-	
 	@Override
 	public void parsecmd(String command, L2PcInstance activeChar)
 	{
@@ -568,7 +564,6 @@ public class RegionBBSManager extends BaseBBSManager
 		return null;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final RegionBBSManager _instance = new RegionBBSManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/TopBBSManager.java

@@ -23,10 +23,6 @@ import com.l2jserver.gameserver.network.serverpackets.ShowBoard;
 
 public class TopBBSManager extends BaseBBSManager
 {
-	private TopBBSManager()
-	{
-	}
-	
 	@Override
 	public void parsecmd(String command, L2PcInstance activeChar)
 	{
@@ -81,7 +77,6 @@ public class TopBBSManager extends BaseBBSManager
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final TopBBSManager _instance = new TopBBSManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java

@@ -42,7 +42,7 @@ public class TopicBBSManager extends BaseBBSManager
 		return SingletonHolder._instance;
 	}
 	
-	private TopicBBSManager()
+	protected TopicBBSManager()
 	{
 		_table = new FastList<Topic>();
 		_maxId = new FastMap<Forum, Integer>().shared();
@@ -442,7 +442,6 @@ public class TopicBBSManager extends BaseBBSManager
 		separateAndSend(html.toString(), activeChar);
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final TopicBBSManager _instance = new TopicBBSManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AdminTable.java

@@ -47,7 +47,8 @@ public class AdminTable extends DocumentParser
 	private Map<String, L2AdminCommandAccessRight> _adminCommandAccessRights;
 	private Map<L2PcInstance, Boolean> _gmList;
 	private int _highestLevel = 0;
-	private AdminTable()
+	
+	protected AdminTable()
 	{
 		_accessLevels = new HashMap<>();
 		_adminCommandAccessRights = new HashMap<>();
@@ -311,7 +312,6 @@ public class AdminTable extends DocumentParser
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final AdminTable _instance = new AdminTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ArmorSetsData.java

@@ -34,7 +34,7 @@ public final class ArmorSetsData extends DocumentParser
 {
 	private static final Map<Integer, L2ArmorSet> _armorSets = new HashMap<>();
 	
-	private ArmorSetsData()
+	protected ArmorSetsData()
 	{
 		_armorSets.clear();
 		parseDirectory(new File(Config.DATAPACK_ROOT, "data/stats/armorsets"));
@@ -173,7 +173,6 @@ public final class ArmorSetsData extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ArmorSetsData _instance = new ArmorSetsData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AugmentationData.java

@@ -111,7 +111,7 @@ public class AugmentationData
 	
 	private final TIntObjectHashMap<AugmentationSkill> _allSkills = new TIntObjectHashMap<AugmentationSkill>();
 	
-	private AugmentationData()
+	protected AugmentationData()
 	{
 		_log.info("Initializing AugmentationData.");
 		
@@ -948,7 +948,6 @@ public class AugmentationData
 		return temp.getSkill();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final AugmentationData _instance = new AugmentationData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharNameTable.java

@@ -42,7 +42,7 @@ public class CharNameTable
 	private final Map<Integer, String> _chars;
 	private final Map<Integer, Integer> _accessLevels;
 	
-	private CharNameTable()
+	protected CharNameTable()
 	{
 		_chars = new FastMap<Integer, String>();
 		_accessLevels = new FastMap<Integer, Integer>();
@@ -277,7 +277,6 @@ public class CharNameTable
 		_log.info(getClass().getSimpleName()+": Loaded "+_chars.size()+" char names.");
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CharNameTable _instance = new CharNameTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharSummonTable.java

@@ -328,7 +328,6 @@ public class CharSummonTable
 		petSummon.broadcastStatusUpdate();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CharSummonTable _instance = new CharSummonTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharTemplateTable.java

@@ -38,7 +38,7 @@ public final class CharTemplateTable
 	
 	private static final Map<ClassId, L2PcTemplate> _charTemplates = new HashMap<>();
 	
-	private CharTemplateTable()
+	protected CharTemplateTable()
 	{
 		Connection con = null;
 		try
@@ -127,7 +127,6 @@ public final class CharTemplateTable
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CharTemplateTable _instance = new CharTemplateTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ClanTable.java

@@ -73,7 +73,7 @@ public class ClanTable
 		return _clans.values().toArray(new L2Clan[_clans.size()]);
 	}
 	
-	private ClanTable()
+	protected ClanTable()
 	{
 		// forums has to be loaded before clan data, because of last forum id used should have also memo included
 		if (Config.COMMUNITY_TYPE > 0)
@@ -555,7 +555,6 @@ public class ClanTable
 			clan.updateClanScoreInDB();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ClanTable _instance = new ClanTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ClassListData.java

@@ -34,7 +34,7 @@ public final class ClassListData extends DocumentParser
 {
 	private static final Map<ClassId, ClassInfo> _classData = new HashMap<>();
 	
-	private ClassListData()
+	protected ClassListData()
 	{
 		_classData.clear();
 		parseDatapackFile("data/stats/chars/classList.xml");
@@ -122,7 +122,6 @@ public final class ClassListData extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ClassListData _instance = new ClassListData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

@@ -46,7 +46,7 @@ public class DoorTable
 	private final TIntObjectHashMap<L2DoorInstance> _staticItems;
 	private final TIntObjectHashMap<ArrayList<L2DoorInstance>> _regions;
 	
-	private DoorTable()
+	protected DoorTable()
 	{
 		_staticItems = new TIntObjectHashMap<L2DoorInstance>();
 		_regions = new TIntObjectHashMap<ArrayList<L2DoorInstance>>();
@@ -371,7 +371,6 @@ public class DoorTable
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final DoorTable _instance = new DoorTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantGroupsTable.java

@@ -55,7 +55,7 @@ public class EnchantGroupsTable
 	}
 	
 	
-	private EnchantGroupsTable()
+	protected EnchantGroupsTable()
 	{
 		load();
 	}
@@ -64,11 +64,9 @@ public class EnchantGroupsTable
 	{
 		int count = 0;
 		Connection con = null;
-		
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
-			
 			try
 			{
 				_enchantSkillGroups = new TIntObjectHashMap<L2EnchantSkillGroup>();
@@ -211,7 +209,6 @@ public class EnchantGroupsTable
 		return 0;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final EnchantGroupsTable _instance = new EnchantGroupsTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantHPBonusData.java

@@ -50,7 +50,7 @@ public class EnchantHPBonusData
 		return SingletonHolder._instance;
 	}
 	
-	private EnchantHPBonusData()
+	protected EnchantHPBonusData()
 	{
 		load();
 	}
@@ -189,7 +189,6 @@ public class EnchantHPBonusData
 		return values[Math.min(item.getOlyEnchantLevel(), values.length) - 1];
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final EnchantHPBonusData _instance = new EnchantHPBonusData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemData.java

@@ -137,7 +137,6 @@ public class EnchantItemData extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final EnchantItemData _instance = new EnchantItemData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EventDroplist.java

@@ -41,7 +41,7 @@ public class EventDroplist
 	
 	public static class DateDrop
 	{
-		private final DateRange _dateRange;
+		protected final DateRange _dateRange;
 		private final EventDrop _eventDrop;
 		
 		public DateDrop(DateRange dateRange, EventDrop eventDrop)
@@ -115,7 +115,6 @@ public class EventDroplist
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final EventDroplist _instance = new EventDroplist();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ExperienceTable.java

@@ -34,7 +34,7 @@ public final class ExperienceTable extends DocumentParser
 	private byte MAX_LEVEL;
 	private byte MAX_PET_LEVEL;
 	
-	private ExperienceTable()
+	protected ExperienceTable()
 	{
 		_expTable.clear();
 		parseDatapackFile("data/stats/experience.xml");
@@ -93,7 +93,6 @@ public final class ExperienceTable extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ExperienceTable _instance = new ExperienceTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/FishData.java

@@ -37,7 +37,7 @@ public final class FishData extends DocumentParser
 	private static final Map<Integer, L2Fish> _fishsEasy = new HashMap<>();
 	private static final Map<Integer, L2Fish> _fishsHard = new HashMap<>();
 	
-	private FishData()
+	protected FishData()
 	{
 		_fishsEasy.clear();
 		_fishsNormal.clear();
@@ -155,7 +155,6 @@ public final class FishData extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final FishData _instance = new FishData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/FishingRodsData.java

@@ -33,7 +33,7 @@ public final class FishingRodsData extends DocumentParser
 {
 	private static final Map<Integer, L2FishingRod> _fishingRods = new HashMap<>();
 	
-	private FishingRodsData()
+	protected FishingRodsData()
 	{
 		_fishingRods.clear();
 		
@@ -87,7 +87,6 @@ public final class FishingRodsData extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final FishingRodsData _instance = new FishingRodsData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HelperBuffTable.java

@@ -64,7 +64,7 @@ public class HelperBuffTable
 	/**
 	 * Create and Load the Newbie Helper Buff list from SQL Table helper_buff_list
 	 */
-	private HelperBuffTable()
+	protected HelperBuffTable()
 	{
 		_helperBuff = new FastList<L2HelperBuff>();
 		restoreHelperBuffData();
@@ -220,7 +220,6 @@ public class HelperBuffTable
 		return _servitorHighestLevel;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final HelperBuffTable _instance = new HelperBuffTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HennaData.java

@@ -39,7 +39,7 @@ public final class HennaData extends DocumentParser
 {
 	private static final Map<Integer, L2Henna> _hennaList = new HashMap<>();
 	
-	private HennaData()
+	protected HennaData()
 	{
 		_hennaList.clear();
 		parseDatapackFile("data/stats/hennaList.xml");
@@ -151,7 +151,6 @@ public final class HennaData extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final HennaData _instance = new HennaData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HerbDropTable.java

@@ -44,7 +44,7 @@ public class HerbDropTable
 		return SingletonHolder._instance;
 	}
 	
-	private HerbDropTable()
+	protected HerbDropTable()
 	{
 		_herbGroups = new TIntObjectHashMap<FastList<L2DropCategory>>();
 		restoreData();
@@ -128,7 +128,6 @@ public class HerbDropTable
 		return _herbGroups.get(groupId);
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final HerbDropTable _instance = new HerbDropTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HitConditionBonus.java

@@ -37,7 +37,7 @@ public final class HitConditionBonus extends DocumentParser
 	private int darkBonus = 0;
 	private int rainBonus = 0;
 	
-	private HitConditionBonus()
+	protected HitConditionBonus()
 	{
 		parseDatapackFile("data/stats/hitConditionBonus.xml");
 		_log.info(getClass().getSimpleName() + ": Loaded Hit Condition bonuses.");
@@ -137,7 +137,6 @@ public final class HitConditionBonus extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final HitConditionBonus _instance = new HitConditionBonus();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/InitialEquipmentData.java

@@ -40,7 +40,7 @@ public final class InitialEquipmentData extends DocumentParser
 	private static final String filePathEvent = "data/stats/initialEquipmentEvent.xml";
 	private final Map<ClassId, List<PcItemTemplate>> _initialEquipmentList = new HashMap<>();
 	
-	private InitialEquipmentData()
+	protected InitialEquipmentData()
 	{
 		_initialEquipmentList.clear();
 		parseDatapackFile(Config.INITIAL_EQUIPMENT_EVENT ? filePathEvent : filePathNormal);
@@ -114,7 +114,6 @@ public final class InitialEquipmentData extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final InitialEquipmentData _instance = new InitialEquipmentData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -186,7 +186,7 @@ public class ItemTable
 	/**
 	 * Constructor.
 	 */
-	private ItemTable()
+	protected ItemTable()
 	{
 		_etcItems = new FastMap<Integer, L2EtcItem>();
 		_armors = new FastMap<Integer, L2Armor>();
@@ -484,7 +484,6 @@ public class ItemTable
 		return _allTemplates.length;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ItemTable _instance = new ItemTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/LevelUpData.java

@@ -56,7 +56,7 @@ public class LevelUpData
 		return SingletonHolder._instance;
 	}
 	
-	private LevelUpData()
+	protected LevelUpData()
 	{
 		_lvlTable = new TIntObjectHashMap<L2LvlupData>();
 		Connection con = null;
@@ -114,7 +114,6 @@ public class LevelUpData
 		return _lvlTable.get(classId.getId());
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final LevelUpData _instance = new LevelUpData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java

@@ -52,10 +52,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 	private Map<Integer, MerchantPriceConfig> _mpcs = new FastMap<Integer, MerchantPriceConfig>();
 	private MerchantPriceConfig _defaultMpc;
 	
-	private MerchantPriceConfigTable()
-	{
-	}
-	
 	public MerchantPriceConfig getMerchantPriceConfig(L2MerchantInstance npc)
 	{
 		for (MerchantPriceConfig mpc : _mpcs.values())
@@ -284,7 +280,6 @@ public class MerchantPriceConfigTable implements InstanceListManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final MerchantPriceConfigTable _instance = new MerchantPriceConfigTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/MultiSell.java

@@ -61,7 +61,7 @@ public class MultiSell
 		return SingletonHolder._instance;
 	}
 	
-	private MultiSell()
+	protected MultiSell()
 	{
 		_entries = new TIntObjectHashMap<ListContainer>();
 		load();
@@ -416,7 +416,6 @@ public class MultiSell
 		return false;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final MultiSell _instance = new MultiSell();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcBufferTable.java

@@ -68,7 +68,7 @@ public class NpcBufferTable
 		}
 	}
 	
-	private NpcBufferTable()
+	protected NpcBufferTable()
 	{
 		Connection con = null;
 		int skillCount = 0;
@@ -196,7 +196,6 @@ public class NpcBufferTable
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final NpcBufferTable _instance = new NpcBufferTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -47,7 +47,7 @@ public class NpcTable
 	
 	private final TIntObjectHashMap<L2NpcTemplate> _npcs = new TIntObjectHashMap<L2NpcTemplate>();
 	
-	private NpcTable()
+	protected NpcTable()
 	{
 		_npcs.clear();
 		restoreNpcData();
@@ -1110,7 +1110,6 @@ public class NpcTable
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final NpcTable _instance = new NpcTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcWalkerRoutesTable.java

@@ -47,7 +47,7 @@ public class NpcWalkerRoutesTable
 		return SingletonHolder._instance;
 	}
 	
-	private NpcWalkerRoutesTable()
+	protected NpcWalkerRoutesTable()
 	{
 		if (Config.ALLOW_NPC_WALKERS)
 		{
@@ -146,7 +146,6 @@ public class NpcWalkerRoutesTable
 		return _routes.get(id);
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final NpcWalkerRoutesTable _instance = new NpcWalkerRoutesTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/PetDataTable.java

@@ -35,7 +35,7 @@ public final class PetDataTable extends DocumentParser
 {
 	private static final Map<Integer, L2PetData> _pets = new HashMap<>();
 	
-	private PetDataTable()
+	protected PetDataTable()
 	{
 		_pets.clear();
 		parseDatapackFile("data/stats/npc/PetData.xml");
@@ -373,7 +373,6 @@ public final class PetDataTable extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final PetDataTable _instance = new PetDataTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/PetNameTable.java

@@ -32,10 +32,6 @@ public class PetNameTable
 {
 	private static Logger _log = Logger.getLogger(PetNameTable.class.getName());
 	
-	private PetNameTable()
-	{
-	}
-	
 	public static PetNameTable getInstance()
 	{
 		return SingletonHolder._instance;
@@ -116,7 +112,6 @@ public class PetNameTable
 		return result;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final PetNameTable _instance = new PetNameTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTable.java

@@ -39,7 +39,7 @@ public class SkillTable
 		return SingletonHolder._instance;
 	}
 	
-	private SkillTable()
+	protected SkillTable()
 	{
 		_skills = new TIntObjectHashMap<L2Skill>();
 		_skillMaxLevel = new TIntIntHashMap();
@@ -159,7 +159,6 @@ public class SkillTable
 		return temp;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SkillTable _instance = new SkillTable();
@@ -189,9 +188,9 @@ public class SkillTable
 		THE_VANQUISHED_OF_WAR(5075, 1),
 		SPECIAL_TREE_RECOVERY_BONUS(2139, 1);
 		
-		private final int _id;
-		private final int _level;
-		private L2Skill _skill = null;
+		protected final int _id;
+		protected final int _level;
+		protected L2Skill _skill = null;
 		
 		private FrequentSkill(int id, int level)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

@@ -98,7 +98,7 @@ public final class SkillTreesData extends DocumentParser
 	 */
 	private static final Map<ClassId, ClassId> _parentClassMap = new HashMap<>();
 	
-	private SkillTreesData()
+	protected SkillTreesData()
 	{
 		load();
 	}
@@ -1207,7 +1207,6 @@ public final class SkillTreesData extends DocumentParser
 	/**
 	 * Singleton holder for the SkillTreesData class.
 	 */
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SkillTreesData _instance = new SkillTreesData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -49,7 +49,7 @@ public class SpawnTable
 		return SingletonHolder._instance;
 	}
 	
-	private SpawnTable()
+	protected SpawnTable()
 	{
 		if (!Config.ALT_DEV_NO_SPAWNS)
 			fillSpawnTable();
@@ -348,7 +348,6 @@ public class SpawnTable
 			activeChar.sendMessage("No current spawns found.");
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SpawnTable _instance = new SpawnTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/StaticObjects.java

@@ -36,7 +36,7 @@ public final class StaticObjects extends DocumentParser
 {
 	private static final Map<Integer, L2StaticObjectInstance> _staticObjects = new HashMap<>();
 	
-	private StaticObjects()
+	protected StaticObjects()
 	{
 		_staticObjects.clear();
 		parseDatapackFile("data/staticObjects.xml");
@@ -98,7 +98,6 @@ public final class StaticObjects extends DocumentParser
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final StaticObjects _instance = new StaticObjects();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonEffectsTable.java

@@ -95,7 +95,6 @@ public class SummonEffectsTable
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SummonEffectsTable _instance = new SummonEffectsTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonItemsData.java

@@ -36,7 +36,7 @@ public class SummonItemsData
 		return SingletonHolder._instance;
 	}
 	
-	private SummonItemsData()
+	protected SummonItemsData()
 	{
 		Scanner s;
 		try
@@ -118,7 +118,6 @@ public class SummonItemsData
 		return result;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SummonItemsData _instance = new SummonItemsData();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonSkillsTable.java

@@ -44,7 +44,7 @@ public class SummonSkillsTable
 		load();
 	}
 	
-	private SummonSkillsTable()
+	protected SummonSkillsTable()
 	{
 		_skillTrees = new FastMap<Integer, Map<Integer, L2PetSkillLearn>>();
 		load();
@@ -196,7 +196,6 @@ public class SummonSkillsTable
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SummonSkillsTable _instance = new SummonSkillsTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/TeleportLocationTable.java

@@ -42,7 +42,7 @@ public class TeleportLocationTable
 		return SingletonHolder._instance;
 	}
 	
-	private TeleportLocationTable()
+	protected TeleportLocationTable()
 	{
 		reloadAll();
 	}
@@ -136,7 +136,6 @@ public class TeleportLocationTable
 		return _teleports.get(id);
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final TeleportLocationTable _instance = new TeleportLocationTable();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/UITable.java

@@ -45,7 +45,7 @@ public class UITable
 		return SingletonHolder._instance;
 	}
 	
-	private UITable()
+	protected UITable()
 	{
 		parseCatData();
 		parseKeyData();
@@ -154,7 +154,6 @@ public class UITable
 		return _storedKeys;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final UITable _instance = new UITable();

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentEngine.java

@@ -45,7 +45,7 @@ public class DocumentEngine
 		return SingletonHolder._instance;
 	}
 	
-	private DocumentEngine()
+	protected DocumentEngine()
 	{
 		hashFiles("data/stats/items", _itemFiles);
 		if (Config.CUSTOM_ITEMS_LOAD)
@@ -117,7 +117,6 @@ public class DocumentEngine
 		return list;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final DocumentEngine _instance = new DocumentEngine();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionHandler.java

@@ -29,7 +29,7 @@ public class ActionHandler
 		return SingletonHolder._instance;
 	}
 	
-	private ActionHandler()
+	protected ActionHandler()
 	{
 		_actions = new FastMap<InstanceType, IActionHandler>();
 	}
@@ -56,7 +56,6 @@ public class ActionHandler
 		return _actions.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ActionHandler _instance = new ActionHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionShiftHandler.java

@@ -32,7 +32,7 @@ public class ActionShiftHandler
 		return SingletonHolder._instance;
 	}
 	
-	private ActionShiftHandler()
+	protected ActionShiftHandler()
 	{
 		_actionsShift = new FastMap<InstanceType, IActionHandler>();
 	}
@@ -59,7 +59,6 @@ public class ActionShiftHandler
 		return _actionsShift.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ActionShiftHandler _instance = new ActionShiftHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java

@@ -36,7 +36,7 @@ public class AdminCommandHandler
 		return SingletonHolder._instance;
 	}
 	
-	private AdminCommandHandler()
+	protected AdminCommandHandler()
 	{
 		_datatable = new TIntObjectHashMap<IAdminCommandHandler>();
 	}
@@ -72,7 +72,6 @@ public class AdminCommandHandler
 		return _datatable.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final AdminCommandHandler _instance = new AdminCommandHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/BypassHandler.java

@@ -37,7 +37,7 @@ public class BypassHandler
 		return SingletonHolder._instance;
 	}
 	
-	private BypassHandler()
+	protected BypassHandler()
 	{
 		_datatable = new TIntObjectHashMap<IBypassHandler>();
 	}
@@ -73,7 +73,6 @@ public class BypassHandler
 		return _datatable.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final BypassHandler _instance = new BypassHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ChatHandler.java

@@ -39,7 +39,7 @@ public class ChatHandler
 	/**
 	 * Singleton constructor
 	 */
-	private ChatHandler()
+	protected ChatHandler()
 	{
 		_datatable = new TIntObjectHashMap<IChatHandler>();
 	}
@@ -78,7 +78,6 @@ public class ChatHandler
 		return _datatable.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ChatHandler _instance = new ChatHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/EffectHandler.java

@@ -28,15 +28,10 @@ import com.l2jserver.gameserver.scripting.L2ScriptEngineManager;
  */
 public final class EffectHandler
 {
-	private static final class SingletonHolder
-	{
-		private static final EffectHandler _instance = new EffectHandler();
-	}
-	
 	private static final Logger _log = Logger.getLogger(EffectHandler.class.getName());
 	private final FastMap<Integer, Class<? extends L2Effect>> _handlers;
 	
-	private EffectHandler()
+	protected EffectHandler()
 	{
 		_handlers = new FastMap<Integer, Class<? extends L2Effect>>();
 	}
@@ -69,6 +64,11 @@ public final class EffectHandler
 		}
 	}
 	
+	private static final class SingletonHolder
+	{
+		protected static final EffectHandler _instance = new EffectHandler();
+	}
+	
 	public static EffectHandler getInstance()
 	{
 		return SingletonHolder._instance;

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ItemHandler.java

@@ -48,7 +48,7 @@ public class ItemHandler
 	/**
 	 * Constructor of ItemHandler
 	 */
-	private ItemHandler()
+	protected ItemHandler()
 	{
 		_datatable = new TIntObjectHashMap<IItemHandler>();
 	}
@@ -77,7 +77,6 @@ public class ItemHandler
 		return _datatable.get(item.getHandlerName().hashCode());
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ItemHandler _instance = new ItemHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/SkillHandler.java

@@ -33,7 +33,7 @@ public class SkillHandler
 		return SingletonHolder._instance;
 	}
 	
-	private SkillHandler()
+	protected SkillHandler()
 	{
 		_datatable = new TIntObjectHashMap<ISkillHandler>();
 	}
@@ -60,7 +60,6 @@ public class SkillHandler
 		return _datatable.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final SkillHandler _instance = new SkillHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TargetHandler.java

@@ -32,7 +32,7 @@ public class TargetHandler
 		return SingletonHolder._instance;
 	}
 	
-	private TargetHandler()
+	protected TargetHandler()
 	{
 		_datatable = new FastMap<Enum<L2TargetType>, ITargetTypeHandler>();
 	}
@@ -52,7 +52,6 @@ public class TargetHandler
 		return _datatable.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final TargetHandler _instance = new TargetHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TelnetHandler.java

@@ -28,7 +28,7 @@ public class TelnetHandler
 		return SingletonHolder._instance;
 	}
 	
-	private TelnetHandler()
+	protected TelnetHandler()
 	{
 		_telnetHandlers = new TIntObjectHashMap<ITelnetHandler>();
 	}
@@ -58,7 +58,6 @@ public class TelnetHandler
 		return _telnetHandlers.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final TelnetHandler _instance = new TelnetHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/UserCommandHandler.java

@@ -36,7 +36,7 @@ public class UserCommandHandler
 		return SingletonHolder._instance;
 	}
 	
-	private UserCommandHandler()
+	protected UserCommandHandler()
 	{
 		_datatable = new TIntObjectHashMap<IUserCommandHandler>();
 	}
@@ -67,7 +67,6 @@ public class UserCommandHandler
 		return _datatable.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final UserCommandHandler _instance = new UserCommandHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/VoicedCommandHandler.java

@@ -36,7 +36,7 @@ public class VoicedCommandHandler
 		return SingletonHolder._instance;
 	}
 	
-	private VoicedCommandHandler()
+	protected VoicedCommandHandler()
 	{
 		_datatable = new TIntObjectHashMap<IVoicedCommandHandler>();
 	}
@@ -72,7 +72,6 @@ public class VoicedCommandHandler
 		return _datatable.size();
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final VoicedCommandHandler _instance = new VoicedCommandHandler();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

@@ -52,7 +52,7 @@ public class AirShipManager
 		return SingletonHolder._instance;
 	}
 	
-	private AirShipManager()
+	protected AirShipManager()
 	{
 		StatsSet npcDat = new StatsSet();
 		npcDat.set("npcId", 9);
@@ -335,7 +335,6 @@ public class AirShipManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final AirShipManager _instance = new AirShipManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java

@@ -41,7 +41,7 @@ public class AntiFeedManager
 		return SingletonHolder._instance;
 	}
 	
-	private AntiFeedManager()
+	protected AntiFeedManager()
 	{
 		_lastDeathTimes = new FastMap<Integer,Long>().shared();
 		_eventIPs = new TIntObjectHashMap<Map<Integer, Connections>>();
@@ -246,7 +246,7 @@ public class AntiFeedManager
 		return limit < 0 ? 0 : limit + max;
 	}
 
-	private static final class Connections
+	protected static final class Connections
 	{
 		private int _num = 0;
 
@@ -301,8 +301,7 @@ public class AntiFeedManager
 			return true;
 		}
 	}
-
-	@SuppressWarnings("synthetic-access")
+	
 	private static class SingletonHolder
 	{
 		protected static final AntiFeedManager _instance = new AntiFeedManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java

@@ -84,7 +84,7 @@ public class AuctionManager
 		return SingletonHolder._instance;
 	}
 	
-	private AuctionManager()
+	protected AuctionManager()
 	{
 		_log.info("Initializing AuctionManager");
 		_auctions = new FastList<Auction>();
@@ -184,7 +184,6 @@ public class AuctionManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final AuctionManager _instance = new AuctionManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/BoatManager.java

@@ -44,7 +44,7 @@ public class BoatManager
 		return SingletonHolder._instance;
 	}
 	
-	private BoatManager()
+	protected BoatManager()
 	{
 		for (int i = 0; i < _docksBusy.length; i++)
 			_docksBusy[i] = false;
@@ -176,7 +176,7 @@ public class BoatManager
 		VehiclePathPoint _point1, _point2;
 		L2GameServerPacket[] _packets;
 		
-		private ForEachPlayerBroadcastPackets(VehiclePathPoint point1, VehiclePathPoint point2, L2GameServerPacket ... packets)
+		protected ForEachPlayerBroadcastPackets(VehiclePathPoint point1, VehiclePathPoint point2, L2GameServerPacket ... packets)
 		{
 			_point1 = point1;
 			_point2 = point2;
@@ -211,7 +211,6 @@ public class BoatManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final BoatManager _instance = new BoatManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CHSiegeManager.java

@@ -42,24 +42,14 @@ public final class CHSiegeManager
 	private static final Logger _log = Logger.getLogger(CHSiegeManager.class.getName());
 	private static final String SQL_LOAD_HALLS = "SELECT * FROM siegable_clanhall";
 	
-	private static final class SingletonHolder
-	{
-		private static final CHSiegeManager INSTANCE = new CHSiegeManager();
-	}
-	
-	private FastMap<Integer, SiegableHall> _siegableHalls = new FastMap<Integer, SiegableHall>();
+	private FastMap<Integer, SiegableHall> _siegableHalls = new FastMap<>();
 	
-	private CHSiegeManager()
+	protected CHSiegeManager()
 	{
 		_log.info("Initializing CHSiegeManager...");
 		loadClanHalls();
 	}
 	
-	public static CHSiegeManager getInstance()
-	{
-		return SingletonHolder.INSTANCE;
-	}
-	
 	private final void loadClanHalls()
 	{
 		Connection con = null;
@@ -192,4 +182,14 @@ public final class CHSiegeManager
 			hall.getSiege().saveAttackers();
 		}
 	}
+	
+	public static CHSiegeManager getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
+	private static final class SingletonHolder
+	{
+		protected static final CHSiegeManager _instance = new CHSiegeManager();
+	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManager.java

@@ -46,10 +46,6 @@ public class CastleManager implements InstanceListManager
 	
 	private static final int _castleCirclets[] = { 0, 6838, 6835, 6839, 6837, 6840, 6834, 6836, 8182, 8183 };
 	
-	private CastleManager()
-	{
-	}
-	
 	public final int findNearestCastleIndex(L2Object obj)
 	{
 		return findNearestCastleIndex(obj, Long.MAX_VALUE);
@@ -295,7 +291,6 @@ public class CastleManager implements InstanceListManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CastleManager _instance = new CastleManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java

@@ -180,7 +180,7 @@ public class CastleManorManager
 		}
 	}
 	
-	private CastleManorManager()
+	protected CastleManorManager()
 	{
 		_log.info("Initializing CastleManorManager");
 		load(); // load data from database
@@ -596,7 +596,6 @@ public class CastleManorManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CastleManorManager _instance = new CastleManorManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java

@@ -57,7 +57,7 @@ public final class ClanHallManager
 		return _loaded;
 	}
 	
-	private ClanHallManager()
+	protected ClanHallManager()
 	{
 		_log.info("Initializing ClanHallManager");
 		_clanHall = new FastMap<Integer, AuctionableHall>();
@@ -305,7 +305,6 @@ public final class ClanHallManager
 		return null;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final ClanHallManager _instance = new ClanHallManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java

@@ -35,7 +35,7 @@ public class CoupleManager
 {
 	private static final Logger _log = Logger.getLogger(CoupleManager.class.getName());
 	
-	private CoupleManager()
+	protected CoupleManager()
 	{
 		_log.info("L2JMOD: Initializing CoupleManager");
 		load();
@@ -158,7 +158,6 @@ public class CoupleManager
 		return _couples;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CoupleManager _instance = new CoupleManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CursedWeaponsManager.java

@@ -65,7 +65,7 @@ public class CursedWeaponsManager
 	
 	private Map<Integer, CursedWeapon> _cursedWeapons;
 	
-	private CursedWeaponsManager()
+	protected CursedWeaponsManager()
 	{
 		init();
 	}
@@ -480,7 +480,6 @@ public class CursedWeaponsManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final CursedWeaponsManager _instance = new CursedWeaponsManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java

@@ -46,7 +46,7 @@ public class DayNightSpawnManager
 		return SingletonHolder._instance;
 	}
 	
-	private DayNightSpawnManager()
+	protected DayNightSpawnManager()
 	{
 		_dayCreatures = new ArrayList<L2Spawn>();
 		_nightCreatures = new ArrayList<L2Spawn>();
@@ -245,7 +245,6 @@ public class DayNightSpawnManager
 		return null;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final DayNightSpawnManager _instance = new DayNightSpawnManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -63,7 +63,7 @@ public class DimensionalRiftManager
 		return SingletonHolder._instance;
 	}
 	
-	private DimensionalRiftManager()
+	protected DimensionalRiftManager()
 	{
 		loadRooms();
 		loadSpawns();
@@ -559,7 +559,6 @@ public class DimensionalRiftManager
 		return list;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final DimensionalRiftManager _instance = new DimensionalRiftManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DuelManager.java

@@ -35,7 +35,7 @@ public class DuelManager
 	private FastList<Duel> _duels;
 	private int _currentDuelId = 0x90;
 	
-	private DuelManager()
+	protected DuelManager()
 	{
 		_log.info("Initializing DuelManager");
 		_duels = new FastList<Duel>();
@@ -205,7 +205,6 @@ public class DuelManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final DuelManager _instance = new DuelManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortManager.java

@@ -40,10 +40,6 @@ public class FortManager implements InstanceListManager
 	
 	private List<Fort> _forts;
 	
-	private FortManager()
-	{
-	}
-	
 	public final int findNearestFortIndex(L2Object obj)
 	{
 		return findNearestFortIndex(obj, Long.MAX_VALUE);
@@ -203,7 +199,6 @@ public class FortManager implements InstanceListManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final FortManager _instance = new FortManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java

@@ -65,7 +65,7 @@ public class FortSiegeManager
 	private int _suspiciousMerchantRespawnDelay = 180; // Time in minute. Changeable in fortsiege.properties
 	private List<FortSiege> _sieges;
 	
-	private FortSiegeManager()
+	protected FortSiegeManager()
 	{
 		_log.info("Initializing FortSiegeManager");
 		load();
@@ -421,7 +421,6 @@ public class FortSiegeManager
 		}
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final FortSiegeManager _instance = new FortSiegeManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -143,10 +143,6 @@ public class FourSepulchersManager
 	
 	protected byte _newCycleMin = 55;
 	
-	private FourSepulchersManager()
-	{
-	}
-	
 	public static final FourSepulchersManager getInstance()
 	{
 		return SingletonHolder._instance;
@@ -1787,7 +1783,6 @@ public class FourSepulchersManager
 		player.sendPacket(html);
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final FourSepulchersManager _instance = new FourSepulchersManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java

@@ -33,7 +33,7 @@ public class GlobalVariablesManager
 	
 	private final Map<String, String> _variablesMap;
 	
-	private GlobalVariablesManager()
+	protected GlobalVariablesManager()
 	{
 		_variablesMap = new FastMap<String, String>();
 		
@@ -120,7 +120,6 @@ public class GlobalVariablesManager
 		return SingletonHolder._instance;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final GlobalVariablesManager _instance = new GlobalVariablesManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GraciaSeedsManager.java

@@ -23,7 +23,7 @@ import com.l2jserver.gameserver.model.quest.Quest;
 
 public class GraciaSeedsManager
 {
-	private static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName());
+	protected static final Logger _log = Logger.getLogger(GraciaSeedsManager.class.getName());
 
 	public static String qn = "EnergySeeds";
 	
@@ -36,7 +36,7 @@ public class GraciaSeedsManager
 	private int _SoDState = 1;
 	private Calendar _SoDLastStateChangeDate;
 
-	private GraciaSeedsManager()
+	protected GraciaSeedsManager()
 	{
 		_log.info(getClass().getSimpleName()+": Initializing");
 		_SoDLastStateChangeDate = Calendar.getInstance();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java

@@ -100,7 +100,7 @@ public class GrandBossManager
 		return SingletonHolder._instance;
 	}
 	
-	private GrandBossManager()
+	protected GrandBossManager()
 	{
 		_log.info("Initializing GrandBossManager");
 		init();
@@ -471,7 +471,6 @@ public class GrandBossManager
 		return _zones;
 	}
 	
-	@SuppressWarnings("synthetic-access")
 	private static class SingletonHolder
 	{
 		protected static final GrandBossManager _instance = new GrandBossManager();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -51,7 +51,7 @@ public final class HandysBlockCheckerManager
 	private static final Map<Integer, Boolean> _arenaStatus = new HashMap<>();
 	
 	// Registration request penalty (10 seconds)
-	private static List<Integer> _registrationPenalty = new ArrayList<>();
+	protected static List<Integer> _registrationPenalty = new ArrayList<>();
 	
 	/**
 	 * Return the number of event-start votes for the specified
@@ -99,7 +99,7 @@ public final class HandysBlockCheckerManager
 		_arenaVotes.put(arena, 0);
 	}
 
-	private HandysBlockCheckerManager()
+	protected HandysBlockCheckerManager()
 	{
 		// Initialize arena status
 		_arenaStatus.put(0, false);
@@ -348,16 +348,6 @@ public final class HandysBlockCheckerManager
 		}
 	}
 	
-	public static HandysBlockCheckerManager getInstance()
-	{
-		return SingletonHolder._instance;
-	}
-	
-	private static class SingletonHolder
-	{
-		private static HandysBlockCheckerManager _instance = new HandysBlockCheckerManager();
-	}
-	
 	public class ArenaParticipantsHolder
 	{
 		int _arena;
@@ -451,7 +441,7 @@ public final class HandysBlockCheckerManager
 			_engine.updatePlayersOnStart(this);
 		}
 		
-		private void checkAndShuffle()
+		protected void checkAndShuffle()
 		{
 			int redSize = _redPlayers.size();
 			int blueSize = _bluePlayers.size();
@@ -499,4 +489,14 @@ public final class HandysBlockCheckerManager
 			_registrationPenalty.remove(objectId);
 		}
 	}
+	
+	public static HandysBlockCheckerManager getInstance()
+	{
+		return SingletonHolder._instance;
+	}
+	
+	private static class SingletonHolder
+	{
+		protected static final HandysBlockCheckerManager _instance = new HandysBlockCheckerManager();
+	}
 }