BETA: Performance fixes:

	* Replacing String literal can with character literal.
	* Equality test with boolean literal: false
	* A class that is not serializable declares a method named serialVersionUID.
	* Cannot compare strings using the not equals (!= or ==) operator.
	* Long literals should use "L" for a suffix.
	* Avoiding extra math at ThreadPoolManager for each task.
	* Removed unnecessary casting to super-classes.
	* Fixing logic in many equals(Object) methods.
	* Removed unnecessary overridden method.

L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -57,7 +57,7 @@ import com.l2jserver.util.StringUtil;
  */
 public final class Config
 {
-	protected static final Logger _log = Logger.getLogger(Config.class.getName());
+	private static final Logger _log = Logger.getLogger(Config.class.getName());
 	
 	// --------------------------------------------------
 	// L2J Property File Definitions

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

@@ -990,7 +990,7 @@ public class SevenSignsFestival implements SpawnListener
 				
 			query.append("accumulated_bonus");
 			query.append(String.valueOf(FESTIVAL_COUNT - 1));
-			query.append(" ");
+			query.append(' ');
 			query.append("FROM seven_signs_status WHERE id=0");
 			
 			statement = con.prepareStatement(query.toString());

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

@@ -121,8 +121,8 @@ public class ThreadPoolManager
 		_generalPacketsThreadPool = new ThreadPoolExecutor(Config.GENERAL_PACKET_THREAD_CORE_SIZE, Config.GENERAL_PACKET_THREAD_CORE_SIZE + 2, 15L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new PriorityThreadFactory("Normal Packet Pool", Thread.NORM_PRIORITY + 1));
 		_generalThreadPool = new ThreadPoolExecutor(Config.GENERAL_THREAD_CORE_SIZE, Config.GENERAL_THREAD_CORE_SIZE + 2, 5L, TimeUnit.SECONDS, new LinkedBlockingQueue<Runnable>(), new PriorityThreadFactory("General Pool", Thread.NORM_PRIORITY));
 		_aiScheduledThreadPool = new ScheduledThreadPoolExecutor(Config.AI_MAX_THREAD, new PriorityThreadFactory("AISTPool", Thread.NORM_PRIORITY));
-		
-		scheduleGeneralAtFixedRate(new PurgeTask(), 10*60*1000l, 5*60*1000l);
+		// Initial 10 minutes, delay 5 minutes.
+		scheduleGeneralAtFixedRate(new PurgeTask(), 600000L, 300000L);
 	}
 	
 	public static long validateDelay(long delay)

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

@@ -58,7 +58,6 @@ public class FastMRUCache<K, V> extends FastCollection implements Reusable
 		{
 			return _node == object;
 		}
-		
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/BB/Forum.java

@@ -292,7 +292,7 @@ public class Forum
 	 */
 	public void vload()
 	{
-		if (_loaded == false)
+		if (!_loaded)
 		{
 			load();
 			getChildren();

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

@@ -264,7 +264,7 @@ public class NpcTable
 		sb.append(attribute);
 		sb.append(" = '");
 		sb.append(value);
-		sb.append("'");
+		sb.append('\'');
 	}
 	
 	/**

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

@@ -231,9 +231,9 @@ public class FourSepulchersManager
 			tmp.set(Calendar.HOUR, Calendar.getInstance().get(Calendar.HOUR) - 1);
 		tmp.set(Calendar.MINUTE, _newCycleMin);
 		_coolDownTimeEnd = tmp.getTimeInMillis();
-		_entryTimeEnd = _coolDownTimeEnd + Config.FS_TIME_ENTRY * 60000l;
-		_warmUpTimeEnd = _entryTimeEnd + Config.FS_TIME_WARMUP * 60000l;
-		_attackTimeEnd = _warmUpTimeEnd + Config.FS_TIME_ATTACK * 60000l;
+		_entryTimeEnd = _coolDownTimeEnd + Config.FS_TIME_ENTRY * 60000L;
+		_warmUpTimeEnd = _entryTimeEnd + Config.FS_TIME_WARMUP * 60000L;
+		_attackTimeEnd = _warmUpTimeEnd + Config.FS_TIME_ATTACK * 60000L;
 	}
 	
 	public void clean()
@@ -1628,7 +1628,7 @@ public class FourSepulchersManager
 			if (_firstTimeRun)
 				interval = _entryTimeEnd - Calendar.getInstance().getTimeInMillis();
 			else
-				interval = Config.FS_TIME_ENTRY * 60000l; // else use stupid
+				interval = Config.FS_TIME_ENTRY * 60000L; // else use stupid
 			// method
 			
 			// launching saying process...
@@ -1662,7 +1662,7 @@ public class FourSepulchersManager
 			if (_firstTimeRun)
 				interval = _warmUpTimeEnd - Calendar.getInstance().getTimeInMillis();
 			else
-				interval = Config.FS_TIME_WARMUP * 60000l;
+				interval = Config.FS_TIME_WARMUP * 60000L;
 			_changeAttackTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ChangeAttackTime(), interval);
 			
 			if (_changeWarmUpTimeTask != null)
@@ -1723,7 +1723,7 @@ public class FourSepulchersManager
 			if (_firstTimeRun)
 				interval = _attackTimeEnd - Calendar.getInstance().getTimeInMillis();
 			else
-				interval = Config.FS_TIME_ATTACK * 60000l;
+				interval = Config.FS_TIME_ATTACK * 60000L;
 			_changeCoolDownTimeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ChangeCoolDownTime(), interval);
 			
 			if (_changeAttackTimeTask != null)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/Elementals.java

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.model;
 
 import gnu.trove.map.hash.TIntObjectHashMap;
 
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.funcs.FuncAdd;
 import com.l2jserver.gameserver.model.skills.funcs.LambdaConst;
@@ -256,7 +255,7 @@ public final class Elementals
 			if (!_active)
 				return;
 			
-			((L2Character) player).removeStatsOwner(this);
+			player.removeStatsOwner(this);
 			
 			_active = false;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ItemRequest.java

@@ -61,19 +61,10 @@ public class ItemRequest
 		{
 			return true;
 		}
-		if (obj == null)
+		if (!(obj instanceof ItemRequest))
 		{
 			return false;
 		}
-		if (getClass() != obj.getClass())
-		{
-			return false;
-		}
-		ItemRequest other = (ItemRequest) obj;
-		if (_objectId != other._objectId)
-		{
-			return false;
-		}
-		return true;
+		return (_objectId != ((ItemRequest) obj)._objectId);
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Augmentation.java

@@ -19,7 +19,6 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.datatables.AugmentationData;
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.funcs.FuncAdd;
@@ -79,7 +78,7 @@ public final class L2Augmentation
 			if (_active) return;
 			
 			for (int i=0; i < _stats.length; i++)
-				((L2Character)player).addStatFunc(new FuncAdd(_stats[i], 0x40, this, new LambdaConst(_values[i])));
+				player.addStatFunc(new FuncAdd(_stats[i], 0x40, this, new LambdaConst(_values[i])));
 			
 			_active = true;
 		}
@@ -87,9 +86,11 @@ public final class L2Augmentation
 		public void removeBonus(L2PcInstance player)
 		{
 			// make sure the bonuses are not removed twice
-			if (!_active) return;
-			
-			((L2Character)player).removeStatsOwner(this);
+			if (!_active)
+			{
+				return;
+			}
+			player.removeStatsOwner(this);
 			
 			_active = false;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2RaidBossInstance.java

@@ -23,7 +23,6 @@ import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Summon;
 import com.l2jserver.gameserver.model.actor.templates.L2NpcTemplate;
 import com.l2jserver.gameserver.model.entity.Hero;
-import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.Rnd;
@@ -152,16 +151,6 @@ public class L2RaidBossInstance extends L2MonsterInstance
 		}
 	}
 	
-	/**
-	 * Reduce the current HP of the L2Attackable, update its _aggroList and launch the doDie Task if necessary.<BR><BR>
-	 *
-	 */
-	@Override
-	public void reduceCurrentHp(double damage, L2Character attacker, boolean awake, boolean isDOT, L2Skill skill)
-	{
-		super.reduceCurrentHp(damage, attacker, awake, isDOT, skill);
-	}
-	
 	public void setRaidStatus (RaidBossSpawnManager.StatusEnum status)
 	{
 		_raidStatus = status;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Castle.java

@@ -1224,7 +1224,7 @@ public class Castle
 					query.append(values[0]);
 					for (int i = 1; i < values.length; i++)
 					{
-						query.append(",");
+						query.append(',');
 						query.append(values[i]);
 					}
 					statement = con.prepareStatement(query.toString());
@@ -1297,7 +1297,7 @@ public class Castle
 					query.append(values[0]);
 					for (int i = 1; i < values.length; i++)
 					{
-						query.append(",").append(values[i]);
+						query.append(',').append(values[i]);
 					}
 					statement = con.prepareStatement(query.toString());
 					statement.execute();
@@ -1342,7 +1342,7 @@ public class Castle
 					query.append(values[0]);
 					for (int i = 1; i < values.length; i++)
 					{
-						query.append(",");
+						query.append(',');
 						query.append(values[i]);
 					}
 					statement = con.prepareStatement(query.toString());
@@ -1415,7 +1415,7 @@ public class Castle
 					query.append(values[0]);
 					for (int i = 1; i < values.length; i++)
 					{
-						query.append(",");
+						query.append(',');
 						query.append(values[i]);
 					}
 					statement = con.prepareStatement(query.toString());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/Fort.java

@@ -644,12 +644,12 @@ public class Fort
 				setOwnerClan(clan);
 				int runCount = getOwnedTime() / (Config.FS_UPDATE_FRQ * 60);
 				long initial = System.currentTimeMillis() - _lastOwnedTime.getTimeInMillis();
-				while (initial > (Config.FS_UPDATE_FRQ * 60000l))
-					initial -= (Config.FS_UPDATE_FRQ * 60000l);
-				initial = (Config.FS_UPDATE_FRQ * 60000l) - initial;
+				while (initial > (Config.FS_UPDATE_FRQ * 60000L))
+					initial -= (Config.FS_UPDATE_FRQ * 60000L);
+				initial = (Config.FS_UPDATE_FRQ * 60000L) - initial;
 				if (Config.FS_MAX_OWN_TIME <= 0 || getOwnedTime() < Config.FS_MAX_OWN_TIME * 3600)
 				{
-					_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.PERIODIC_UPDATE), initial, Config.FS_UPDATE_FRQ * 60000l); // Schedule owner tasks to start running
+					_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.PERIODIC_UPDATE), initial, Config.FS_UPDATE_FRQ * 60000L); // Schedule owner tasks to start running
 					if (Config.FS_MAX_OWN_TIME > 0)
 						_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, runCount, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener
 				}
@@ -953,7 +953,7 @@ public class Fort
 					_FortUpdater[0].cancel(false);
 				if (_FortUpdater[1] != null)
 					_FortUpdater[1].cancel(false);
-				_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.PERIODIC_UPDATE), Config.FS_UPDATE_FRQ * 60000l, Config.FS_UPDATE_FRQ * 60000l); // Schedule owner tasks to start running
+				_FortUpdater[0] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.PERIODIC_UPDATE), Config.FS_UPDATE_FRQ * 60000L, Config.FS_UPDATE_FRQ * 60000L); // Schedule owner tasks to start running
 				if (Config.FS_MAX_OWN_TIME > 0)
 					_FortUpdater[1] = ThreadPoolManager.getInstance().scheduleGeneralAtFixedRate(new FortUpdater(this, clan, 0, UpdaterType.MAX_OWN_TIME), 3600000, 3600000); // Schedule owner tasks to remove owener
 			}
@@ -1046,7 +1046,7 @@ public class Fort
 		if (_lastOwnedTime.getTimeInMillis() == 0)
 			return 0;
 		
-		return (int) ((_lastOwnedTime.getTimeInMillis() + Config.FS_MAX_OWN_TIME * 3600000l - System.currentTimeMillis()) / 1000l);
+		return (int) ((_lastOwnedTime.getTimeInMillis() + Config.FS_MAX_OWN_TIME * 3600000L - System.currentTimeMillis()) / 1000L);
 	}
 	
 	public final long getTimeTillNextFortUpdate()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -266,7 +266,7 @@ public class FortSiege implements Siegable
 			getSiegeGuardManager().unspawnSiegeGuard(); // Remove all spawned siege guard from this fort
 			getFort().resetDoors(); // Respawn door to fort
 			
-			ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000l); // Prepare 3hr task for suspicious merchant respawn
+			ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSuspiciousMerchantSpawn(), FortSiegeManager.getInstance().getSuspiciousMerchantRespawnDelay() * 60 * 1000L); // Prepare 3hr task for suspicious merchant respawn
 			setSiegeDateTime(true); // store suspicious merchant spawn in DB
 			
 			if (_siegeEnd != null)
@@ -326,7 +326,7 @@ public class FortSiege implements Siegable
 			getFort().getZone().updateZoneStatusForCharactersInside();
 			
 			// Schedule a task to prepare auto siege end
-			_siegeEnd = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000l); // Prepare auto end task
+			_siegeEnd = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleEndSiegeTask(), FortSiegeManager.getInstance().getSiegeLength() * 60 * 1000L); // Prepare auto end task
 			
 			final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.THE_FORTRESS_BATTLE_S1_HAS_BEGUN);
 			sm.addFortId(getFort().getFortId());
@@ -639,7 +639,7 @@ public class FortSiege implements Siegable
 				else if (_siegeRestore == null)
 				{
 					getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.SEIZED_BARRACKS));
-					_siegeRestore = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000l);
+					_siegeRestore = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSiegeRestore(), FortSiegeManager.getInstance().getCountDownLength() * 60 * 1000L);
 				}
 				else
 					getFort().getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.SEIZED_BARRACKS));

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -298,7 +298,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		_attribute = set.getString("attribute","");
 		String str = set.getString("negateStats", "");
 		
-		if (str == "")
+		if (str.isEmpty())
 			_negateStats = new L2SkillType[0];
 		else
 		{
@@ -323,7 +323,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		}
 		
 		String negateAbnormals = set.getString("negateAbnormals", null);
-		if (negateAbnormals != null && negateAbnormals != "")
+		if (negateAbnormals != null && !negateAbnormals.isEmpty())
 		{
 			_negateAbnormals = new FastMap<String, Byte>();
 			for (String ngtStack : negateAbnormals.split(";"))
@@ -473,7 +473,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		_triggeredId = set.getInteger("triggeredId", 0);
 		_triggeredLevel = set.getInteger("triggeredLevel", 0);
 		_chanceType = set.getString("chanceType", "");
-		if (_chanceType != "" && !_chanceType.isEmpty())
+		if (!_chanceType.isEmpty() && !_chanceType.isEmpty())
 			_chanceCondition = ChanceCondition.parse(set);
 		
 		_numSouls = set.getInteger("num_souls", 0);

L2J_Server_BETA/java/com/l2jserver/gameserver/script/ScriptPackage.java

@@ -104,7 +104,7 @@ public class ScriptPackage
 		StringBuilder out = new StringBuilder();
 		out.append("Package Name: ");
 		out.append(getName());
-		out.append("\n");
+		out.append('\n');
 		
 		if (!getScriptFiles().isEmpty())
 		{
@@ -112,7 +112,7 @@ public class ScriptPackage
 			for (ScriptDocument script : getScriptFiles())
 			{
 				out.append(script.getName());
-				out.append("\n");
+				out.append('\n');
 			}
 		}
 		
@@ -122,7 +122,7 @@ public class ScriptPackage
 			for (String fileName : getOtherFiles())
 			{
 				out.append(fileName);
-				out.append("\n");
+				out.append('\n');
 			}
 		}
 		return out.toString();

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java

@@ -130,7 +130,7 @@ public class DecayTaskManager
 		{
 			ret.append("Class/Name: ");
 			ret.append(actor.getClass().getSimpleName());
-			ret.append("/");
+			ret.append('/');
 			ret.append(actor.getName());
 			ret.append(" decay timer: ");
 			ret.append(current - _decayTasks.get(actor));

L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/TaskManager.java

@@ -122,7 +122,15 @@ public final class TaskManager
 		@Override
 		public boolean equals(Object object)
 		{
-			return object == null ? false : id == ((ExecutedTask) object).id;
+			if (this == object)
+			{
+				return true;
+			}
+			if (!(object instanceof ExecutedTask))
+			{
+				return false;
+			}
+			return id == ((ExecutedTask) object).id;
 		}
 		
 		@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/util/L2SyncMap.java

@@ -35,7 +35,6 @@ import com.l2jserver.util.L2FastMap.I2ForEachValue;
  */
 public class L2SyncMap<K extends Object, V extends Object> implements Map<K, V>
 {
-	static final long serialVersionUID = 1L;
 	private final L2FastMap<K, V> _map = new L2FastMap<K, V>();
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/util/Point3D.java

@@ -75,6 +75,10 @@ public class Point3D implements Serializable
 	@Override
 	public boolean equals(Object o)
 	{
+		if (this == o)
+		{
+			return true;
+		}
 		if (o instanceof Point3D)
 		{
 			Point3D point3D = (Point3D) o;

L2J_Server_BETA/java/com/l2jserver/loginserver/SessionKey.java

@@ -52,14 +52,22 @@ public class SessionKey
 	}
 	
 	/**
-	 * <p>
 	 * Only checks the PlayOk part of the session key if server doesn't show the license when player logs in.
-	 * </p>
-	 * @param key
+	 * @param o
 	 * @return true if keys are equal.
 	 */
-	public boolean equals(SessionKey key)
+	@Override
+	public boolean equals(Object o)
 	{
+		if (this == o)
+		{
+			return true;
+		}
+		if (!(o instanceof SessionKey))
+		{
+			return false;
+		}
+		final SessionKey key = (SessionKey) o;
 		// when server doesn't show license it doesn't send the LoginOk packet, client doesn't have this part of the key then.
 		if (Config.SHOW_LICENCE)
 		{

L2J_Server_BETA/java/com/l2jserver/tools/configurator/JIPTextField.java

@@ -150,7 +150,7 @@ public class JIPTextField extends JPanel implements FocusListener
 		{
 			if (_textFields[i].getText().length() == 0)
 			{
-				str.append("0");
+				str.append('0');
 			}
 			else
 			{
@@ -159,7 +159,7 @@ public class JIPTextField extends JPanel implements FocusListener
 			
 			if (i < 3)
 			{
-				str.append(".");
+				str.append('.');
 			}
 		}
 		return str.toString();

L2J_Server_BETA/java/com/l2jserver/tools/ngl/LocaleCodes.java

@@ -44,18 +44,18 @@ public class LocaleCodes
 			String country = locale.getCountry();
 			String variant = locale.getVariant();
 			
-			if ((language == "") && (country == "") && (variant == ""))
+			if (language.isEmpty() && country.isEmpty() && variant.isEmpty())
 			{
 				continue;
 			}
 			
 			StringBuilder lang = new StringBuilder();
 			lang.append(language);
-			if (country != "")
+			if (!country.isEmpty())
 			{
 				lang.append(country);
 			}
-			if (variant != "")
+			if (!variant.isEmpty())
 			{
 				lang.append('_' + variant);
 			}

L2J_Server_BETA/java/com/l2jserver/tools/ngl/LocalizationParser.java

@@ -49,11 +49,11 @@ public class LocalizationParser
 		
 		StringBuilder sb = new StringBuilder();
 		sb.append(language);
-		if (country != "")
+		if (!country.isEmpty())
 		{
 			sb.append(country);
 		}
-		if (variant != "")
+		if (!variant.isEmpty())
 		{
 			sb.append('_' + variant);
 			// Java 7 Function

L2J_Server_BETA/java/com/l2jserver/util/DeadLockDetector.java

@@ -76,25 +76,25 @@ public class DeadLockDetector extends Thread
 						
 						ThreadInfo dl = ti;
 						info.append("Java-level deadlock:\n");
-						info.append("\t");
+						info.append('\t');
 						info.append(dl.getThreadName());
 						info.append(" is waiting to lock ");
 						info.append(dl.getLockInfo().toString());
 						info.append(" which is held by ");
 						info.append(dl.getLockOwnerName());
-						info.append("\n");
+						info.append('\n');
 						while ((dl = tmx.getThreadInfo(new long[]
 						{
 							dl.getLockOwnerId()
 						}, true, true)[0]).getThreadId() != ti.getThreadId())
 						{
-							info.append("\t");
+							info.append('\t');
 							info.append(dl.getThreadName());
 							info.append(" is waiting to lock ");
 							info.append(dl.getLockInfo().toString());
 							info.append(" which is held by ");
 							info.append(dl.getLockOwnerName());
-							info.append("\n");
+							info.append('\n');
 						}
 					}
 					_log.warning(info.toString());

L2J_Server_BETA/java/com/l2jserver/util/IPSubnet.java

@@ -126,6 +126,10 @@ public class IPSubnet
 	@Override
 	public boolean equals(Object o)
 	{
+		if (this == o)
+		{
+			return true;
+		}
 		if (o instanceof IPSubnet)
 		{
 			return applyMask(((IPSubnet) o).getAddress());

L2J_Server_BETA/java/com/l2jserver/util/StringUtil.java

@@ -271,7 +271,7 @@ public final class StringUtil
 		final TextBuilder sbString = TextBuilder.newInstance();
 		for (final StackTraceElement element : trace)
 		{
-			sbString.append(element.toString()).append("\n");
+			sbString.append(element.toString()).append('\n');
 		}
 		
 		String result = sbString.toString();

L2J_Server_BETA/java/com/l2jserver/util/Util.java

@@ -89,7 +89,7 @@ public class Util
 					}
 				}
 				
-				result.append("\n");
+				result.append('\n');
 				counter = 0;
 			}
 		}
@@ -116,7 +116,7 @@ public class Util
 				}
 			}
 			
-			result.append("\n");
+			result.append('\n');
 		}
 		
 		return result.toString();

L2J_Server_BETA/java/com/l2jserver/util/network/BaseRecievePacket.java

@@ -58,13 +58,13 @@ public abstract class BaseRecievePacket
 	public double readF()
 	{
 		long result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] & 0xffl) << 8l;
-		result |= (_decrypt[_off++] & 0xffl) << 16l;
-		result |= (_decrypt[_off++] & 0xffl) << 24l;
-		result |= (_decrypt[_off++] & 0xffl) << 32l;
-		result |= (_decrypt[_off++] & 0xffl) << 40l;
-		result |= (_decrypt[_off++] & 0xffl) << 48l;
-		result |= (_decrypt[_off++] & 0xffl) << 56l;
+		result |= (_decrypt[_off++] & 0xffL) << 8L;
+		result |= (_decrypt[_off++] & 0xffL) << 16L;
+		result |= (_decrypt[_off++] & 0xffL) << 24L;
+		result |= (_decrypt[_off++] & 0xffL) << 32L;
+		result |= (_decrypt[_off++] & 0xffL) << 40L;
+		result |= (_decrypt[_off++] & 0xffL) << 48L;
+		result |= (_decrypt[_off++] & 0xffL) << 56L;
 		return Double.longBitsToDouble(result);
 	}
 	
@@ -99,13 +99,13 @@ public abstract class BaseRecievePacket
 	public long readQ()
 	{
 		long result = _decrypt[_off++] & 0xff;
-		result |= (_decrypt[_off++] & 0xffl) << 8l;
-		result |= (_decrypt[_off++] & 0xffl) << 16l;
-		result |= (_decrypt[_off++] & 0xffl) << 24l;
-		result |= (_decrypt[_off++] & 0xffl) << 32l;
-		result |= (_decrypt[_off++] & 0xffl) << 40l;
-		result |= (_decrypt[_off++] & 0xffl) << 48l;
-		result |= (_decrypt[_off++] & 0xffl) << 56l;
+		result |= (_decrypt[_off++] & 0xffL) << 8L;
+		result |= (_decrypt[_off++] & 0xffL) << 16L;
+		result |= (_decrypt[_off++] & 0xffL) << 24L;
+		result |= (_decrypt[_off++] & 0xffL) << 32L;
+		result |= (_decrypt[_off++] & 0xffL) << 40L;
+		result |= (_decrypt[_off++] & 0xffL) << 48L;
+		result |= (_decrypt[_off++] & 0xffL) << 56L;
 		return result;
 	}
 }