A combination of sweeter and safer code. Thanks fordfrog

L2_GameServer/java/net/sf/l2j/ChatFilter.java

@@ -22,7 +22,7 @@ public class ChatFilter implements Filter
 
 	public boolean isLoggable(LogRecord record)
 	{
-		return record.getLoggerName() == "chat";
+		return "chat".equals(record.getLoggerName());
 	}
 
 }

L2_GameServer/java/net/sf/l2j/Config.java

@@ -1220,7 +1220,7 @@ public final class Config
 	                                SKILL_DURATION_LIST.put(Integer.parseInt(skillSplit[0]), Integer.parseInt(skillSplit[1]));
 	                            } catch (NumberFormatException nfe)
 	                            {
-	                                if (!skill.equals(""))
+	                                if (!skill.isEmpty())
 	                                {
 	                                    _log.warning(StringUtil.concat("[SkillDurationList]: invalid config property -> SkillList \"", skillSplit[0], "\"", skillSplit[1]));
 	                                }
@@ -1249,7 +1249,7 @@ public final class Config
 	                                SKILL_REUSE_LIST.put(Integer.valueOf(skillSplit[0]), Integer.valueOf(skillSplit[1]));
 	                            } catch (NumberFormatException nfe)
 	                            {
-	                                if (!skill.equals(""))
+	                                if (!skill.isEmpty())
 	                                {
 	                                    _log.warning(StringUtil.concat("[SkillReuseList]: invalid config property -> SkillList \"", skillSplit[0], "\"", skillSplit[1]));
 	                                }
@@ -1850,7 +1850,7 @@ public final class Config
 	                                		}
 	                                		catch (NumberFormatException nfe)
 	                                		{
-	                                			if (!reward.equals(""))
+	                                			if (!reward.isEmpty())
 	                                			    _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTEventReward \"", reward, "\""));
 	                                		}
 	                                	}
@@ -1886,7 +1886,7 @@ public final class Config
 	                        			}
 	                        			catch (NumberFormatException nfe)
 	                        			{
-	                        				if (!door.equals(""))
+	                        				if (!door.isEmpty())
 	                        				    _log.warning(StringUtil.concat("TvTEventEngine[Config.load()]: invalid config property -> TvTDoorsToClose \"", door, "\""));
 	                        			}
 	                        		}

L2_GameServer/java/net/sf/l2j/ItemFilter.java

@@ -34,7 +34,7 @@ public class ItemFilter implements Filter
 
 	public boolean isLoggable(LogRecord record)
 	{
-		if (record.getLoggerName() != "item") return false;
+		if (!"item".equals(record.getLoggerName())) return false;
 		if (_excludeProcess != null)
 		{
 //			if (record.getMessage() == null) return true;

L2_GameServer/java/net/sf/l2j/L2DatabaseFactory.java

@@ -142,22 +142,38 @@ public class L2DatabaseFactory
 
     public final String safetyString(String... whatToCheck)
     {
-        // NOTE: Use brace as a safty percaution just incase name is a reserved word
-        String braceLeft = "`";
-        String braceRight = "`";
-        if (getProviderType() == ProviderType.MsSql)
-        {
-            braceLeft = "[";
-            braceRight = "]";
+        // NOTE: Use brace as a safty precaution just incase name is a reserved word
+        final char braceLeft;
+        final char braceRight;
+        
+        if (getProviderType() == ProviderType.MsSql) {
+            braceLeft = '[';
+            braceRight = ']';
+        } else {
+            braceLeft = '`';
+            braceRight = '`';
+        }
+
+        int length = 0;
+        
+        for (String word : whatToCheck) {
+            length += word.length() + 4;
         }
 
-        String result = "";
+        final StringBuilder sbResult = new StringBuilder(length);
+        
         for(String word : whatToCheck)
         {
-            if(result != "") result += ", ";
-            result += braceLeft + word + braceRight;
+            if (sbResult.length() > 0) {
+                sbResult.append(", ");
+            }
+
+            sbResult.append(braceLeft);
+            sbResult.append(word);
+            sbResult.append(braceRight);
         }
-        return result;
+        
+        return sbResult.toString();
     }
 
     // =========================================================
@@ -199,4 +215,4 @@ public class L2DatabaseFactory
 	}
 
     public final ProviderType getProviderType() { return _providerType; }
-}
+}

L2_GameServer/java/net/sf/l2j/accountmanager/SQLAccountManager.java

@@ -125,7 +125,6 @@ public class SQLAccountManager
             System.out.println("");
             printAccInfo(_mode);
         }
-        return;
     }
     
     private static void printAccInfo(String m) throws SQLException

L2_GameServer/java/net/sf/l2j/gameserver/RecipeController.java

@@ -136,7 +136,6 @@ public class RecipeController
 
 		SystemMessage sm = new SystemMessage(SystemMessageId.CANT_ALTER_RECIPEBOOK_WHILE_CRAFTING);
 		player.sendPacket(sm);
-		return;
 	}
 
 	public synchronized void requestMakeItemAbort(L2PcInstance player)

L2_GameServer/java/net/sf/l2j/gameserver/SevenSigns.java

@@ -991,7 +991,7 @@ public class SevenSigns
 		}
 
 		// Increasing Seal total score for the player chosen Seal.
-		if (currPlayerData.getString("cabal") == "dawn")
+		if ("dawn".equals(currPlayerData.getString("cabal")))
 			_signsDawnSealTotals.put(chosenSeal, _signsDawnSealTotals.get(chosenSeal) + 1);
 		else
 			_signsDuskSealTotals.put(chosenSeal, _signsDuskSealTotals.get(chosenSeal) + 1);
@@ -1342,7 +1342,7 @@ public class SevenSigns
     			}
     			else
     			{
-    				if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && !currPlayer.getString("cabal").equals(""))
+    				if (!onlinePlayer.isGM() && onlinePlayer.isIn7sDungeon() && !currPlayer.getString("cabal").isEmpty())
     				{
     					onlinePlayer.teleToLocation(MapRegionTable.TeleportWhereType.Town);
     					onlinePlayer.setIsIn7sDungeon(false);

L2_GameServer/java/net/sf/l2j/gameserver/SevenSignsFestival.java

@@ -2101,7 +2101,7 @@ public class SevenSignsFestival implements SpawnListener
                 _log.info("SevenSignsFestival: Initializing festival for " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")");
 
             // Teleport all players to arena and notify them.
-            if (_participants.size() > 0)
+            if (!_participants.isEmpty())
             {
               try {
                for (L2PcInstance participant : _participants)
@@ -2342,7 +2342,7 @@ public class SevenSignsFestival implements SpawnListener
 
         public void sendMessageToParticipants(String message)
         {
-            if (_participants.size() > 0)
+            if (!_participants.isEmpty())
             {
                 CreatureSay cs = new CreatureSay(_witchInst.getObjectId(), 0, "Festival Witch", message);
 
@@ -2360,7 +2360,7 @@ public class SevenSignsFestival implements SpawnListener
             if (Config.DEBUG)
                 _log.info("SevenSignsFestival: Ending festival for " + SevenSigns.getCabalShortName(_cabal) + " (" + getFestivalName(_levelRange) + ")");
 
-            if (_participants.size() > 0)
+            if (!_participants.isEmpty())
             {
                 for (L2PcInstance participant : _participants)
                 {

L2_GameServer/java/net/sf/l2j/gameserver/ai/L2AttackableAI.java

@@ -181,9 +181,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			// from this location.  (Fulminus)
 			
 			// Check if player is an ally (comparing mem addr)
-			if (me.getFactionId() == "varka" && ((L2PcInstance) target).isAlliedWithVarka())
+			if ("varka".equals(me.getFactionId()) && ((L2PcInstance) target).isAlliedWithVarka())
 				return false;
-			if (me.getFactionId() == "ketra" && ((L2PcInstance) target).isAlliedWithKetra())
+			if ("ketra".equals(me.getFactionId()) && ((L2PcInstance) target).isAlliedWithKetra())
 				return false;
 			// check if the target is within the grace period for JUST getting up from fake death
 			if (((L2PcInstance) target).isRecentFakeDeath())
@@ -208,9 +208,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				if (owner.isGM() && (owner.isInvul() || !owner.getAccessLevel().canTakeAggro()))
 					return false;
 				// Check if player is an ally (comparing mem addr)
-				if (me.getFactionId() == "varka" && owner.isAlliedWithVarka())
+				if ("varka".equals(me.getFactionId()) && owner.isAlliedWithVarka())
 					return false;
-				if (me.getFactionId() == "ketra" && owner.isAlliedWithKetra())
+				if ("ketra".equals(me.getFactionId()) && owner.isAlliedWithKetra())
 					return false;
 			}
 		}
@@ -312,7 +312,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				L2Attackable npc = (L2Attackable) _actor;
 				
 				// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
-				if (npc.getKnownList().getKnownPlayers().size() > 0)
+				if (!npc.getKnownList().getKnownPlayers().isEmpty())
 					intention = AI_INTENTION_ACTIVE;
 			}
 			
@@ -693,19 +693,19 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 	        			
 	        			// TODO: Unhardcode this by AI scripts (DrHouse)
 	        			//Catacomb mobs should assist lilim and nephilim other than dungeon
-	        			if ( (faction_id == "c_dungeon_clan") && 
-	        				((npcfaction == "c_dungeon_lilim") || npcfaction == "c_dungeon_nephi")) 
+	        			if ("c_dungeon_clan".equals(faction_id) &&
+	        				("c_dungeon_lilim".equals(npcfaction) || "c_dungeon_nephi".equals(npcfaction)))
 	        				sevenSignFaction = true;
 	        			//Lilim mobs should assist other Lilim and catacomb mobs
-	        			else if ( (faction_id == "c_dungeon_lilim") &&
-	        				(npcfaction == "c_dungeon_clan"))
+	        			else if ("c_dungeon_lilim".equals(faction_id) &&
+	        				"c_dungeon_clan".equals(npcfaction))
 	        				sevenSignFaction = true;
 	        			//Nephilim mobs should assist other Nephilim and catacomb mobs
-	        			else if ( (faction_id == "c_dungeon_nephi") &&
-	        				(npcfaction == "c_dungeon_clan")) 
+	        			else if ("c_dungeon_nephi".equals(faction_id) &&
+	        				"c_dungeon_clan".equals(npcfaction))
 	        				sevenSignFaction = true;
 	        			
-	        			if (faction_id != npc.getFactionId() && !sevenSignFaction)
+	        			if (!faction_id.equals(npc.getFactionId()) && !sevenSignFaction)
 	        				continue;
 	        				
 						// Check if the L2Object is inside the Faction Range of

L2_GameServer/java/net/sf/l2j/gameserver/ai/L2ControllableMobAI.java

@@ -411,8 +411,6 @@ public class L2ControllableMobAI extends L2AttackableAI
 			_actor.setRunning();
 			setIntention(CtrlIntention.AI_INTENTION_ATTACK, hated);
 		}
-		
-		return;
 	}
 	
 	private boolean autoAttackCondition(L2Character target)
@@ -481,7 +479,7 @@ public class L2ControllableMobAI extends L2AttackableAI
 			}
 		}
 		
-		if (potentialTarget.size() == 0) // nothing to do
+		if (potentialTarget.isEmpty()) // nothing to do
 			return null;
 		
 		// we choose a random target

L2_GameServer/java/net/sf/l2j/gameserver/ai/L2FortSiegeGuardAI.java

@@ -194,7 +194,7 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 				L2Attackable npc = (L2Attackable) _actor;
 				
 				// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
-				if (npc.getKnownList().getKnownPlayers().size() > 0)
+				if (!npc.getKnownList().getKnownPlayers().isEmpty())
 					intention = AI_INTENTION_ACTIVE;
 				else
 					intention = AI_INTENTION_IDLE;
@@ -323,7 +323,6 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 			else
 				((L2FortCommanderInstance) _actor).returnHome();
 		}
-		return;
 	}
 	
 	/**

L2_GameServer/java/net/sf/l2j/gameserver/ai/L2NpcWalkerAI.java

@@ -112,7 +112,7 @@ public class L2NpcWalkerAI extends L2CharacterAI implements Runnable
 		if (getActor().getX() == destinationX && getActor().getY() == destinationY && getActor().getZ() == destinationZ)
 		{
 			String chat = _route.get(_currentPos).getChatText();
-			if (chat != null && !chat.equals(""))
+			if (chat != null && !chat.isEmpty())
 			{
 				try
 				{

L2_GameServer/java/net/sf/l2j/gameserver/ai/L2PlayerAI.java

@@ -248,7 +248,6 @@ public class L2PlayerAI extends L2CharacterAI
 			return;
 		
 		_accessor.doAttack(target);
-		return;
 	}
 	
 	private void thinkCast()
@@ -299,8 +298,6 @@ public class L2PlayerAI extends L2CharacterAI
 		}
 		else
 			_accessor.doCast(_skill);
-		
-		return;
 	}
 	
 	private void thinkPickUp()
@@ -314,7 +311,6 @@ public class L2PlayerAI extends L2CharacterAI
 			return;
 		setIntention(AI_INTENTION_IDLE);
 		((L2PcInstance.AIAccessor) _accessor).doPickupItem(target);
-		return;
 	}
 	
 	private void thinkInteract()
@@ -329,7 +325,6 @@ public class L2PlayerAI extends L2CharacterAI
 		if (!(target instanceof L2StaticObjectInstance))
 			((L2PcInstance.AIAccessor) _accessor).doInteract((L2Character) target);
 		setIntention(AI_INTENTION_IDLE);
-		return;
 	}
 	
 	@Override

L2_GameServer/java/net/sf/l2j/gameserver/ai/L2SiegeGuardAI.java

@@ -184,7 +184,7 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 				L2Attackable npc = (L2Attackable) _actor;
 				
 				// If its _knownPlayer isn't empty set the Intention to AI_INTENTION_ACTIVE
-				if (npc.getKnownList().getKnownPlayers().size() > 0)
+				if (!npc.getKnownList().getKnownPlayers().isEmpty())
 					intention = AI_INTENTION_ACTIVE;
 				else
 					intention = AI_INTENTION_IDLE;
@@ -307,7 +307,6 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 		}
 		// Order to the L2SiegeGuardInstance to return to its home location because there's no target to attack
 		((L2SiegeGuardInstance) _actor).returnHome();
-		return;
 	}
 	
 	/**

L2_GameServer/java/net/sf/l2j/gameserver/ai/L2SummonAI.java

@@ -60,7 +60,6 @@ public class L2SummonAI extends L2CharacterAI
 			return;
 		clientStopMoving(null);
 		_accessor.doAttack(getAttackTarget());
-		return;
 	}
 	
 	private void thinkCast()
@@ -79,7 +78,6 @@ public class L2SummonAI extends L2CharacterAI
 		setIntention(AI_INTENTION_IDLE);
 		_startFollow = val;
 		_accessor.doCast(_skill);
-		return;
 	}
 	
 	private void thinkPickUp()
@@ -90,7 +88,6 @@ public class L2SummonAI extends L2CharacterAI
 			return;
 		setIntention(AI_INTENTION_IDLE);
 		((L2Summon.AIAccessor) _accessor).doPickupItem(getTarget());
-		return;
 	}
 	
 	private void thinkInteract()
@@ -100,7 +97,6 @@ public class L2SummonAI extends L2CharacterAI
 		if (maybeMoveToPawn(getTarget(), 36))
 			return;
 		setIntention(AI_INTENTION_IDLE);
-		return;
 	}
 	
 	@Override

L2_GameServer/java/net/sf/l2j/gameserver/datatables/AccessLevels.java

@@ -156,7 +156,7 @@ public class AccessLevels
 				takeAggro = rset.getBoolean("takeAggro");
 				gainExp = rset.getBoolean("gainExp");
 				
-				_accessLevels.put(accessLevel, new L2AccessLevel(accessLevel, name, nameColor, titleColor, childs.equals("") ? null : childs, isGm, allowPeaceAttack, allowFixedRes, allowTransaction, allowAltG, giveDamage, takeAggro, gainExp));
+				_accessLevels.put(accessLevel, new L2AccessLevel(accessLevel, name, nameColor, titleColor, childs.isEmpty() ? null : childs, isGm, allowPeaceAttack, allowFixedRes, allowTransaction, allowAltG, giveDamage, takeAggro, gainExp));
 			}
 			
 			rset.close();

L2_GameServer/java/net/sf/l2j/gameserver/datatables/ClanTable.java

@@ -129,7 +129,7 @@ public class ClanTable
 	 */
 	public L2Clan getClan(int clanId)
 	{
-		L2Clan clan = _clans.get(new Integer(clanId));
+		L2Clan clan = _clans.get(Integer.valueOf(clanId));
 		
 		return clan;
 	}
@@ -210,7 +210,7 @@ public class ClanTable
 		if (Config.DEBUG)
 			_log.fine("New clan created: " + clan.getClanId() + " " + clan.getName());
 		
-		_clans.put(new Integer(clan.getClanId()), clan);
+		_clans.put(Integer.valueOf(clan.getClanId()), clan);
 		
 		//should be update packet only
 		player.sendPacket(new PledgeShowInfoUpdate(clan));

L2_GameServer/java/net/sf/l2j/gameserver/datatables/ExtractableItemsData.java

@@ -73,7 +73,7 @@ public class ExtractableItemsData
 			
 			if (line.startsWith("#"))
 				continue;
-			else if (line.equals(""))
+			else if (line.isEmpty())
 				continue;
 			
 			String[] lineSplit = line.split(";");

L2_GameServer/java/net/sf/l2j/gameserver/datatables/FishTable.java

@@ -140,7 +140,7 @@ public class FishTable
 			
 			result.add(f);
 		}
-		if (result.size() == 0)
+		if (result.isEmpty())
 			_log.warning("Cant Find Any Fish!? - Lvl: " + lvl + " Type: " + type);
 		return result;
 	}

L2_GameServer/java/net/sf/l2j/gameserver/datatables/ItemTable.java

@@ -721,8 +721,7 @@ public class ItemTable
 		}
 		
 		// Create a FastLookUp Table called _allTemplates of size : value of the highest item ID
-		if (true)
-			_log.severe("highest item id used:" + highestId);
+		_log.severe("highest item id used:" + highestId);
 		_allTemplates = new L2Item[highestId + 1];
 		
 		// Insert armor item in Fast Look Up Table

L2_GameServer/java/net/sf/l2j/gameserver/datatables/NpcTable.java

@@ -504,25 +504,38 @@ public class NpcTable
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();
 			Map<String, Object> set = npc.getSet();
+
+            int length = 0;
+
+            for (Object obj : set.keySet()) {
+                // 15 is just guessed npc name length
+                length += ((String) obj).length() + 7 + 15;
+            }
+
+            final StringBuilder sbValues = new StringBuilder(length);
 			
-			String name = "";
-			String values = "";
-			
-			for (Object obj : set.keySet())
-			{
-				name = (String) obj;
+			for (Object obj : set.keySet()) {
+                final String name = (String) obj;
 				
-				if (!name.equalsIgnoreCase("npcId"))
-				{
-					if (values != "")
-						values += ", ";
-					
-					values += name + " = '" + set.get(name) + "'";
+				if (!name.equalsIgnoreCase("npcId")) {
+                    if (sbValues.length() > 0) {
+                        sbValues.append(", ");
+                    }
+
+                    sbValues.append(name);
+                    sbValues.append(" = '");
+                    sbValues.append(set.get(name));
+                    sbValues.append('\'');
 				}
 			}
-			
-			String query = "UPDATE npc SET " + values + " WHERE id = ?";
-			PreparedStatement statement = con.prepareStatement(query);
+
+            final StringBuilder sbQuery =
+                    new StringBuilder(sbValues.length() + 28);
+            sbQuery.append("UPDATE npc SET ");
+            sbQuery.append(sbValues.toString());
+            sbQuery.append(" WHERE id = ?");
+			PreparedStatement statement =
+                    con.prepareStatement(sbQuery.toString());
 			statement.setInt(1, npc.getInteger("npcId"));
 			statement.execute();
 			statement.close();

L2_GameServer/java/net/sf/l2j/gameserver/datatables/PetNameTable.java

@@ -55,7 +55,7 @@ public class PetNameTable
 			String cond = "";
 			for (int it : L2PetDataTable.getPetItemsByNpc(petNpcId))
 			{
-				if (cond != "")
+				if (!cond.isEmpty())
 					cond += ", ";
 				cond += it;
 			}

L2_GameServer/java/net/sf/l2j/gameserver/datatables/SummonItemsData.java

@@ -60,7 +60,7 @@ public class SummonItemsData
 			return;
 		}
 		
-		int lineCount = 0, commentLinesCount = 0;
+		int lineCount = 0;
 		
 		while (s.hasNextLine())
 		{
@@ -70,10 +70,9 @@ public class SummonItemsData
 			
 			if (line.startsWith("#"))
 			{
-				commentLinesCount++;
 				continue;
 			}
-			else if (line.equals(""))
+			else if (line.isEmpty())
 				continue;
 			
 			String[] lineSplit = line.split(";");

L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminAnnouncements.java

@@ -96,7 +96,7 @@ public class AdminAnnouncements implements IAdminCommandHandler
 		{
 			try
 			{
-				int val = new Integer(command.substring(23)).intValue();
+				int val = Integer.parseInt(command.substring(23));
 				Announcements.getInstance().delAnnouncement(val);
 				Announcements.getInstance().listAnnouncements(activeChar);
 			}

L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminEventEngine.java

@@ -208,11 +208,11 @@ public class AdminEventEngine implements IAdminCommandHandler
 				}
 				int i = 0;
 				
-				while (L2Event.participatingPlayers.size() > 0)
+				while (!L2Event.participatingPlayers.isEmpty())
 				{
 					String target = getMaxLeveledPlayer();
 					
-					if (!target.equals(""))
+					if (!target.isEmpty())
 					{
 						
 						L2Event.players.get(i + 1).add(target);
@@ -603,7 +603,7 @@ public class AdminEventEngine implements IAdminCommandHandler
 	void destroyEventNpcs()
 	{
 		L2NpcInstance npc;
-		while (L2Event.npcs.size() > 0)
+		while (!L2Event.npcs.isEmpty())
 		{
 			try
 			{

L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminLogin.java

@@ -66,8 +66,8 @@ public class AdminLogin implements IAdminCommandHandler
 				String number = st.nextToken();
 				try
 				{
-					LoginServerThread.getInstance().setMaxPlayer(new Integer(number).intValue());
-					activeChar.sendMessage("maxPlayer set to " + new Integer(number).intValue());
+					LoginServerThread.getInstance().setMaxPlayer(Integer.parseInt(number));
+					activeChar.sendMessage("maxPlayer set to " + number);
 					showMainPage(activeChar);
 				}
 				catch (NumberFormatException e)
@@ -160,4 +160,4 @@ public class AdminLogin implements IAdminCommandHandler
 		return ADMIN_COMMANDS;
 	}
 	
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/handler/admincommandhandlers/AdminRes.java

@@ -128,7 +128,7 @@ public class AdminRes implements IAdminCommandHandler
 		{
 			int radius = 0;
 			
-			if (!radiusStr.equals(""))
+			if (!radiusStr.isEmpty())
 			{
 				radius = Integer.parseInt(radiusStr);
 				

L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/EnchantScrolls.java

@@ -49,7 +49,6 @@ public class EnchantScrolls implements IItemHandler
 		activeChar.setActiveEnchantItem(item);
 		activeChar.sendPacket(new SystemMessage(SystemMessageId.SELECT_ITEM_TO_ENCHANT));
 		activeChar.sendPacket(new ChooseInventoryItem(item.getItemId()));
-		return;
 	}
 	
 	/**

L2_GameServer/java/net/sf/l2j/gameserver/handler/itemhandlers/Maps.java

@@ -46,7 +46,6 @@ public class Maps implements IItemHandler
 		final L2PcInstance activeChar = (L2PcInstance) playable;
 		final int itemId = item.getItemId();
 		activeChar.sendPacket(new ShowMiniMap(itemId));
-		return;
 	}
 	
 	/**

L2_GameServer/java/net/sf/l2j/gameserver/handler/skillhandlers/Disablers.java

@@ -654,7 +654,7 @@ public class Disablers implements ISkillHandler
 							
 							stat = stat.toLowerCase().intern();
 							
-							if (stat == "buff")
+							if ("buff".equals(stat))
 							{
 								int lvlmodifier = 52 + skill.getMagicLevel() * 2;
 								if (skill.getMagicLevel() == 12)
@@ -668,29 +668,29 @@ public class Disablers implements ISkillHandler
 								if (Rnd.get(100) < landrate)
 									removedBuffs += negateEffect(target, L2SkillType.BUFF, -1, skill.getMaxNegatedEffects());
 							}
-							else if (stat == "debuff" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("debuff".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.DEBUFF, -1, skill.getMaxNegatedEffects());
-							else if (stat == "weakness" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("weakness".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.WEAKNESS, -1, skill.getMaxNegatedEffects());
-							else if (stat == "stun" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("stun".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.STUN, -1, skill.getMaxNegatedEffects());
-							else if (stat == "sleep" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("sleep".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.SLEEP, -1, skill.getMaxNegatedEffects());
-							else if (stat == "confusion" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("confusion".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.CONFUSION, -1, skill.getMaxNegatedEffects());
-							else if (stat == "mute" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("mute".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.MUTE, -1, skill.getMaxNegatedEffects());
-							else if (stat == "fear" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("fear".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.FEAR, -1, skill.getMaxNegatedEffects());
-							else if (stat == "poison" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("poison".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.POISON, skill.getNegateLvl(), skill.getMaxNegatedEffects());
-							else if (stat == "bleed" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("bleed".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.BLEED, skill.getNegateLvl(), skill.getMaxNegatedEffects());
-							else if (stat == "paralyze" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("paralyze".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.PARALYZE, -1, skill.getMaxNegatedEffects());
-							else if (stat == "root" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("root".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 								removedBuffs += negateEffect(target, L2SkillType.ROOT, -1, skill.getMaxNegatedEffects());
-							else if (stat == "heal" && removedBuffs < skill.getMaxNegatedEffects())
+							else if ("heal".equals(stat) && removedBuffs < skill.getMaxNegatedEffects())
 							{
 								ISkillHandler Healhandler = SkillHandler.getInstance().getSkillHandler(L2SkillType.HEAL);
 								if (Healhandler == null)

L2_GameServer/java/net/sf/l2j/gameserver/handler/skillhandlers/Resurrect.java

@@ -71,7 +71,7 @@ public class Resurrect implements ISkillHandler
 				targetToRes.add(target);
 		}
 		
-		if (targetToRes.size() == 0)
+		if (targetToRes.isEmpty())
 		{
 			activeChar.abortCast();
 			activeChar.sendMessage("No valid target to resurrect");

L2_GameServer/java/net/sf/l2j/gameserver/instancemanager/DayNightSpawnManager.java

@@ -101,7 +101,7 @@ public class DayNightSpawnManager {
     private void spawnCreatures(Map<L2Spawn, L2NpcInstance> UnSpawnCreatures,Map<L2Spawn, L2NpcInstance> SpawnCreatures, String UnspawnLogInfo, String SpawnLogInfo){
         try
         {
-            if (UnSpawnCreatures.size() != 0)
+            if (!UnSpawnCreatures.isEmpty())
             {
                 int i = 0;
                 for (L2NpcInstance dayCreature : UnSpawnCreatures.values())
@@ -159,7 +159,7 @@ public class DayNightSpawnManager {
     }
     private void changeMode(int mode)
     {
-        if (_nightCreatures.size() == 0 && _dayCreatures.size() == 0)
+        if (_nightCreatures.isEmpty() && _dayCreatures.isEmpty())
             return;
 
         switch(mode) {

L2_GameServer/java/net/sf/l2j/gameserver/instancemanager/DimensionalRiftManager.java

@@ -302,7 +302,7 @@ public class DimensionalRiftManager
             NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
             html.setFile("data/html/seven_signs/rift/SmallParty.htm");
             html.replace("%npc_name%", npc.getName());
-            html.replace("%count%", new Integer(Config.RIFT_MIN_PARTY_SIZE).toString());
+            html.replace("%count%", Integer.toString(Config.RIFT_MIN_PARTY_SIZE));
             player.sendPacket(html);
             return;
         }
@@ -338,7 +338,7 @@ public class DimensionalRiftManager
             NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
             html.setFile("data/html/seven_signs/rift/NoFragments.htm");
             html.replace("%npc_name%", npc.getName());
-            html.replace("%count%", new Integer(getNeededItems(type)).toString());
+            html.replace("%count%", Integer.toString(getNeededItems(type)));
             player.sendPacket(html);
             return;
         }

L2_GameServer/java/net/sf/l2j/gameserver/instancemanager/FourSepulchersManager.java

@@ -1463,14 +1463,12 @@ public class FourSepulchersManager extends GrandBossManager
 		// _log.info("FourSepulchersManager.DeleteAllMobs: Try to delete " +
 		// _allMobs.size() + " monsters.");
 		
-		int delCnt = 0;
 		for (L2NpcInstance mob : _allMobs)
 		{
 			try
 			{
 				mob.getSpawn().stopRespawn();
 				mob.deleteMe();
-				delCnt++;
 			}
 			catch (Exception e)
 			{

L2_GameServer/java/net/sf/l2j/gameserver/model/CharEffectList.java

@@ -383,7 +383,7 @@ public class CharEffectList
 		synchronized(effectList)
 		{
 
-			if (effect.getStackType() == "none")
+			if ("none".equals(effect.getStackType()))
 			{
 				// Remove Func added by this effect from the L2Character Calculator
 				_owner.removeStatsOwner(effect);
@@ -395,7 +395,7 @@ public class CharEffectList
 				// Get the list of all stacked effects corresponding to the stack type of the L2Effect to add
 				List<L2Effect> stackQueue = _stackedEffects.get(effect.getStackType());
 
-				if (stackQueue == null || stackQueue.size() < 1) return;
+				if (stackQueue == null || stackQueue.isEmpty()) return;
 
 				// Get the identifier of the first stacked effect of the stack group selected
 				L2Effect frontEffect = stackQueue.get(0);
@@ -412,7 +412,7 @@ public class CharEffectList
 						_owner.removeStatsOwner(effect);
 
 						// Check if there's another effect in the Stack Group
-						if (stackQueue.size() > 0)
+						if (!stackQueue.isEmpty())
 						{
 							// Add its list of Funcs to the Calculator set of the L2Character
 							for (L2Effect e : effectList)
@@ -556,7 +556,7 @@ public class CharEffectList
 			stackQueue = new FastList<L2Effect>();
 
 		tempEffect = null;
-		if (stackQueue.size() > 0)
+		if (!stackQueue.isEmpty())
 		{
 			// Get the first stacked effect of the Stack group selected
 			for (L2Effect e : allEffects)

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Attackable.java

@@ -530,7 +530,6 @@ public class L2Attackable extends L2NpcInstance
 
         	if (!getMustRewardExpSP()) return;
 
-        	int rewardCount = 0;
         	int damage;
         	L2Character attacker, ddealer;
         	RewardInfo reward;
@@ -568,7 +567,6 @@ public class L2Attackable extends L2NpcInstance
         				if (reward == null)
         				{
         					reward = new RewardInfo(ddealer, damage);
-        					rewardCount++;
         				}
         				else
         				{

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Character.java

@@ -5658,7 +5658,7 @@ public abstract class L2Character extends L2Object
 				_chanceSkills.remove(skill);
 		}
 		
-		if (_chanceSkills.size() == 0)
+		if (_chanceSkills.isEmpty())
 				_chanceSkills = null;
 	}
 
@@ -6089,7 +6089,7 @@ public abstract class L2Character extends L2Object
 	{
 		if (_disabledSkills == null) return;
 
-		_disabledSkills.remove(new Integer(skillId));
+		_disabledSkills.remove(Integer.valueOf(skillId));
 
 		if (this instanceof L2PcInstance)
 			removeTimeStamp(skillId);

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Clan.java

@@ -281,7 +281,7 @@ public class L2Clan
 	 */
 	public String getLeaderName()
 	{
-		return _members.get(new Integer(_leader.getObjectId())).getName();
+		return _members.get(Integer.valueOf(_leader.getObjectId())).getName();
 	}
 
 	/**
@@ -1136,13 +1136,13 @@ public class L2Clan
     }
     public boolean isAtWarWith(Integer id)
     {
-    	if ((_atWarWith != null)&&(_atWarWith.size() > 0))
+    	if (_atWarWith != null && !_atWarWith.isEmpty())
     		if (_atWarWith.contains(id)) return true;
     	return false;
     }
     public boolean isAtWarAttacker(Integer id)
     {
-    	if ((_atWarAttackers != null)&&(_atWarAttackers.size() > 0))
+    	if (_atWarAttackers != null && !_atWarAttackers.isEmpty())
     		if (_atWarAttackers.contains(id)) return true;
     	return false;
     }
@@ -1179,7 +1179,7 @@ public class L2Clan
 
     public boolean isAtWar()
     {
-       if ((_atWarWith != null)&&(_atWarWith.size() > 0))
+       if (_atWarWith != null && !_atWarWith.isEmpty())
            return true;
        return false;
     }

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Effect.java

@@ -504,7 +504,7 @@ public abstract class L2Effect
 			if (f != null)
 				funcs.add(f);
 		}
-		if (funcs.size() == 0)
+		if (funcs.isEmpty())
 			return _emptyFunctionSet;
 		return funcs.toArray(new Func[funcs.size()]);
 	}

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Party.java

@@ -129,7 +129,7 @@ public class L2Party {
 			if (member.getInventory().validateCapacityByItemId(ItemId) &&
                     Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) availableMembers.add(member);
 		}
-		if (availableMembers.size() > 0) return availableMembers.get(Rnd.get(availableMembers.size()));
+		if (!availableMembers.isEmpty()) return availableMembers.get(Rnd.get(availableMembers.size()));
 		else return null;
 	}
 

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Skill.java

@@ -1972,7 +1972,7 @@ public abstract class L2Skill
 					}
 				}
 
-                if (targetList.size() == 0)
+                if (targetList.isEmpty())
                     return null;
 
                 return targetList.toArray(new L2Character[targetList.size()]);
@@ -2129,7 +2129,7 @@ public abstract class L2Skill
 					}
 				}
 
-                if (targetList.size() == 0)
+                if (targetList.isEmpty())
                     return null;
 
                 return targetList.toArray(new L2Character[targetList.size()]);
@@ -2282,7 +2282,7 @@ public abstract class L2Skill
 					}
 				}
 
-                if (targetList.size() == 0)
+                if (targetList.isEmpty())
                     return null;
 
                 return targetList.toArray(new L2Character[targetList.size()]);
@@ -2311,7 +2311,7 @@ public abstract class L2Skill
 						if (obj instanceof L2Attackable && obj != target)
 							targetList.add((L2Character) obj);
 						
-						if (targetList.size() == 0)
+						if (targetList.isEmpty())
 						{
 							activeChar.sendPacket(new SystemMessage(SystemMessageId.TARGET_CANT_FOUND));
 							return null;
@@ -2809,7 +2809,7 @@ public abstract class L2Skill
 					}
 				}
 
-                if (targetList.size() == 0) return null;
+                if (targetList.isEmpty()) return null;
                 return targetList.toArray(new L2Character[targetList.size()]);
             }
             case TARGET_UNLOCKABLE:
@@ -2901,7 +2901,7 @@ public abstract class L2Skill
 					}
 				}
 
-                if (targetList.size() == 0) return null;
+                if (targetList.isEmpty()) return null;
                 return targetList.toArray(new L2Character[targetList.size()]);
             }
             case TARGET_ENEMY_SUMMON:
@@ -2953,7 +2953,7 @@ public abstract class L2Skill
             Func f = t.getFunc(env, this); // skill is owner
             if (f != null) funcs.add(f);
         }
-        if (funcs.size() == 0) return _emptyFunctionSet;
+        if (funcs.isEmpty()) return _emptyFunctionSet;
         return funcs.toArray(new Func[funcs.size()]);
     }
 
@@ -3003,7 +3003,7 @@ public abstract class L2Skill
             if (e != null) effects.add(e);
         }
 
-        if (effects.size() == 0) return _emptyEffectSet;
+        if (effects.isEmpty()) return _emptyEffectSet;
 
         return effects.toArray(new L2Effect[effects.size()]);
     }
@@ -3039,7 +3039,7 @@ public abstract class L2Skill
             if (e != null) effects.add(e);
         }
 
-        if (effects.size() == 0) return _emptyEffectSet;
+        if (effects.isEmpty()) return _emptyEffectSet;
 
         return effects.toArray(new L2Effect[effects.size()]);
     }
@@ -3086,7 +3086,7 @@ public abstract class L2Skill
                 else effects.add(e);
             }
         }
-        if (effects.size() == 0) return _emptyEffectSet;
+        if (effects.isEmpty()) return _emptyEffectSet;
 
         return effects.toArray(new L2Effect[effects.size()]);
     }

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Summon.java

@@ -500,17 +500,14 @@ public abstract class L2Summon extends L2PlayableInstance
 
 	protected void doPickupItem(L2Object object)
     {
-        return;
     }
 
     public void giveAllToOwner()
     {
-        return;
     }
 
     public void store()
     {
-        return;
     }
 
 	@Override

L2_GameServer/java/net/sf/l2j/gameserver/model/L2Transformation.java

@@ -223,6 +223,5 @@ public abstract class L2Transformation implements Cloneable, Runnable
     // Override if necessary
     public void onLevelUp()
     {
-    	return;
     }
 }

L2_GameServer/java/net/sf/l2j/gameserver/model/L2World.java

@@ -248,7 +248,7 @@ public final class L2World
      */
     public L2PetInstance getPet(int ownerId)
     {
-        return _petsInstance.get(new Integer(ownerId));
+        return _petsInstance.get(Integer.valueOf(ownerId));
     }
 
     /**

L2_GameServer/java/net/sf/l2j/gameserver/model/L2WorldRegion.java

@@ -269,12 +269,12 @@ public final class L2WorldRegion
     public Boolean areNeighborsEmpty()
     {
         // if this region is occupied, return false.
-        if (isActive() && (_allPlayable.size() > 0 ))
+        if (isActive() && !_allPlayable.isEmpty())
             return false;
 
         // if any one of the neighbors is occupied, return false
         for (L2WorldRegion neighbor: _surroundingRegions)
-            if (neighbor.isActive() && (neighbor._allPlayable.size() > 0))
+            if (neighbor.isActive() && !neighbor._allPlayable.isEmpty())
                 return false;
 
         // in all other cases, return true.
@@ -389,7 +389,7 @@ public final class L2WorldRegion
         {
             _allPlayable.remove(object.getObjectId());
 
-            if ((_allPlayable.size() == 0 ) && (!Config.GRIDS_ALWAYS_ON))
+            if (_allPlayable.isEmpty() && !Config.GRIDS_ALWAYS_ON)
                 startDeactivation();
         }
     }

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2AuctioneerInstance.java

@@ -114,7 +114,7 @@ public final class L2AuctioneerInstance extends L2FolkInstance
 
             if (actualCommand.equalsIgnoreCase("auction"))
             {
-                if (val == "") return;
+                if (val.isEmpty()) return;
 
                 try
                 {
@@ -170,7 +170,7 @@ public final class L2AuctioneerInstance extends L2FolkInstance
             }
             else if (actualCommand.equalsIgnoreCase("bidding"))
             {
-                if (val == "") return;
+                if (val.isEmpty()) return;
                 if(Config.DEBUG) _log.warning("bidding show successful");
 
                 try
@@ -212,7 +212,7 @@ public final class L2AuctioneerInstance extends L2FolkInstance
             }
             else if (actualCommand.equalsIgnoreCase("bid"))
             {
-                if (val == "") return;
+                if (val.isEmpty()) return;
 
                 try
                 {
@@ -244,7 +244,7 @@ public final class L2AuctioneerInstance extends L2FolkInstance
                     return;
                 }
 
-                if (val == "") return;
+                if (val.isEmpty()) return;
                 if ((player.getClan().getAuctionBiddedAt() > 0 && player.getClan().getAuctionBiddedAt() != Integer.parseInt(val)) || player.getClan().getHasHideout() > 0)
                 {
                     player.sendMessage("You can't bid at more than one auction");
@@ -282,7 +282,7 @@ public final class L2AuctioneerInstance extends L2FolkInstance
                 int start;
             	int i = 1;
             	double npage = Math.ceil((float)auctions.size()/limit);
-            	if (val == ""){
+            	if (val.isEmpty()){
             		start = 1;
             	}else{
             		start = limit*(Integer.parseInt(val)-1)+1;
@@ -323,7 +323,7 @@ public final class L2AuctioneerInstance extends L2FolkInstance
             else if (actualCommand.equalsIgnoreCase("bidlist"))
             {
                 int auctionId = 0;
-                if (val == "")
+                if (val.isEmpty())
                 {
                     if (player.getClan().getAuctionBiddedAt() <= 0)
                         return;
@@ -600,4 +600,4 @@ public final class L2AuctioneerInstance extends L2FolkInstance
 
         return nearestTown;
     }
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2BoatInstance.java

@@ -153,7 +153,6 @@ public class L2BoatInstance extends L2Character
 				bp.time = Integer.parseInt(st.nextToken());
 				_path.put(i, bp);
 			}
-			return;
 		}
 		
 		/**
@@ -929,4 +928,4 @@ public class L2BoatInstance extends L2Character
 	{
 		_id = id;
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2CastleChamberlainInstance.java

@@ -252,7 +252,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 			{
 				if ((player.getClanPrivileges() & L2Clan.CP_CS_USE_FUNCTIONS) == L2Clan.CP_CS_USE_FUNCTIONS)
 				{
-					if (val == "")
+					if (val.isEmpty())
 						return;
 					player.tempInvetoryDisable();
 
@@ -452,7 +452,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 			{
 				if ((player.getClanPrivileges() & L2Clan.CP_CS_OPEN_DOOR) == L2Clan.CP_CS_OPEN_DOOR)
 				{
-					if (val != "")
+					if (!val.isEmpty())
 					{
 						boolean open = (Integer.parseInt(val) == 1);
 						while (st.hasMoreTokens())
@@ -480,7 +480,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 			{
 				if ((player.getClanPrivileges() & L2Clan.CP_CS_TAXES) == L2Clan.CP_CS_TAXES)
 				{
-					if (val != "")
+					if (!val.isEmpty())
 						getCastle().setTaxPercent(player, Integer.parseInt(val));
 
                                         final String msg = StringUtil.concat(
@@ -1192,7 +1192,7 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 			{
 				setTarget(player);
 				L2Skill skill;
-				if (val == "")
+				if (val.isEmpty())
 					return;
 
 				try

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -1257,7 +1257,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
             	}
                 setTarget(player);
                 L2Skill skill;
-                if (val == "") return;
+                if (val.isEmpty()) return;
 
                 try
                 {

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2ClassMasterInstance.java

@@ -351,35 +351,30 @@ public final class L2ClassMasterInstance extends L2FolkInstance
                     );
         html.setHtml(sb);
         player.sendPacket(html);
-        return;
 	}
 
 	private void showChatWindow1st(L2PcInstance player) {
                 NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
             html.setHtml(createGMClassMasterHtml(FIRST_CLASS_IDS));
             player.sendPacket(html);
-            return;
 	}
 
 	private void showChatWindow2nd(L2PcInstance player) {
             NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
             html.setHtml(createGMClassMasterHtml(SECOND_CLASS_IDS));
             player.sendPacket(html);
-            return;
 	}
 
 	private void showChatWindow3rd(L2PcInstance player) {
             NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
             html.setHtml(createGMClassMasterHtml(THIRD_CLASS_IDS));
             player.sendPacket(html);
-            return;
 	}
 
 	private void showChatWindowBase(L2PcInstance player) {
             NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
             html.setHtml(createGMClassMasterHtml(BASE_CLASS_IDS));
             player.sendPacket(html);
-            return;
 	}
 
 	private void changeClass(L2PcInstance player, int val)

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2ControlTowerInstance.java

@@ -108,7 +108,7 @@ public class L2ControlTowerInstance extends L2NpcInstance {
         {
             getCastle().getSiege().killedCT(this);
 
-            if (getGuards() != null && getGuards().size() > 0)
+            if (getGuards() != null && !getGuards().isEmpty())
             {
                 for (L2Spawn spawn: getGuards())
                 {

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FortBallistaInstance.java

@@ -48,7 +48,7 @@ public class L2FortBallistaInstance extends L2NpcInstance
         
         if (getFort().getSiege().getIsInProgress())
         {
-            if (killer instanceof L2PcInstance);
+            if (killer instanceof L2PcInstance)
             {
             	L2PcInstance player = ((L2PcInstance)killer);
             	if (player.getClan() != null && player.getClan().getLevel() >= 5)
@@ -106,4 +106,4 @@ public class L2FortBallistaInstance extends L2NpcInstance
 	{
 		return false;
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FortCommanderInstance.java

@@ -127,7 +127,7 @@ public class L2FortCommanderInstance extends L2FortSiegeGuardInstance
 							text = "Spirit of Fire, unleash your power! Burn the enemy!!";
 							break;
 					}
-					if (text != "")
+					if (!text.isEmpty())
 					{
 						broadcastPacket(new NpcSay(getObjectId(), 1, getNpcId(), text));
 						setCanTalk(false);

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FortManagerInstance.java

@@ -162,7 +162,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 			{
 				if ((player.getClanPrivileges() & L2Clan.CP_CS_OPEN_DOOR) == L2Clan.CP_CS_OPEN_DOOR)
 				{
-					if (val != "")
+					if (!val.isEmpty())
 					{
 						boolean open = (Integer.parseInt(val) == 1);
 						while (st.hasMoreTokens())
@@ -801,7 +801,7 @@ public class L2FortManagerInstance extends L2MerchantInstance
 			{
 				setTarget(player);
 				L2Skill skill;
-				if (val == "")
+				if (val.isEmpty())
 					return;
 
 				try
@@ -923,4 +923,4 @@ public class L2FortManagerInstance extends L2MerchantInstance
 		}
 		return COND_ALL_FALSE;
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FortSiegeNpcInstance.java

@@ -102,7 +102,7 @@ public class L2FortSiegeNpcInstance extends L2NpcInstance
             {
             	player.sendMessage("You are not able to participate"); // replace me with html
             }
-            else if (getFort().getSiege().getAttackerClans().size() == 0 && player.getInventory().getAdena() < 250000)
+            else if (getFort().getSiege().getAttackerClans().isEmpty() && player.getInventory().getAdena() < 250000)
             {
             	player.sendMessage("You need 250,000 adena to register"); // replace me with html
             }
@@ -155,4 +155,4 @@ public class L2FortSiegeNpcInstance extends L2NpcInstance
 	{
 		return false;
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2MercManagerInstance.java

@@ -93,7 +93,7 @@ public final class L2MercManagerInstance extends L2MerchantInstance
 
             if (actualCommand.equalsIgnoreCase("hire"))
             {
-                if (val == "") return;
+                if (val.isEmpty()) return;
 
                 showBuyWindow(player, Integer.parseInt(val));
                 return;
@@ -136,4 +136,4 @@ public final class L2MercManagerInstance extends L2MerchantInstance
 
         return COND_ALL_FALSE;
     }
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2MonsterInstance.java

@@ -173,7 +173,7 @@ public class L2MonsterInstance extends L2Attackable
         if (_minionList.hasMinions())
         {
             List<L2MinionInstance> spawnedMinions = _minionList.getSpawnedMinions();
-            if (spawnedMinions != null && spawnedMinions.size() > 0)
+            if (spawnedMinions != null && !spawnedMinions.isEmpty())
             {
                 Iterator<L2MinionInstance> itr = spawnedMinions.iterator();
                 L2MinionInstance minion;

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2NpcInstance.java

@@ -1834,7 +1834,7 @@ public class L2NpcInstance extends L2Character
 					message += "</a><br>";
 				}
 			}
-			if (message == "")
+			if (message.isEmpty())
 			{
 				message += "There is no winning lottery ticket...<br>";
 			}
@@ -2044,7 +2044,7 @@ public class L2NpcInstance extends L2Character
 			}
 		}
 		
-		if (getTemplate().type == "L2Auctioneer" && val == 0)
+		if ("L2Auctioneer".equals(getTemplate().type) && val == 0)
 			return;
 		
 		int npcId = getTemplate().npcId;

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2NpcWalkerInstance.java

@@ -80,7 +80,7 @@ public class L2NpcWalkerInstance extends L2NpcInstance
 		}
 
 		//we send message to known players only!
-		if(_knownPlayers.size() > 0)
+		if(!_knownPlayers.isEmpty())
 		{
 			CreatureSay cs = new CreatureSay(getObjectId(), 0, getName(), chat);
 			Broadcast.toKnownPlayers(this, cs);

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PcInstance.java

@@ -817,7 +817,6 @@ public final class L2PcInstance extends L2PlayableInstance
     	{
     		_target = destination;
     		_skill = skill;
-    		return;
     	}
 
     	public L2PcInstance getTarget()
@@ -840,7 +839,6 @@ public final class L2PcInstance extends L2PlayableInstance
     	public void setTarget(L2DoorInstance door)
     	{
     		_target = door;
-    		return;
     	}
     	public L2DoorInstance getDoor()
     	{
@@ -5048,7 +5046,7 @@ public final class L2PcInstance extends L2PlayableInstance
 		setPvpFlag(0); // Clear the pvp flag
 		
 		// Unsummon Cubics
-		if (_cubics.size() > 0)
+		if (!_cubics.isEmpty())
 		{
 			for (L2CubicInstance cubic : _cubics.values())
 			{
@@ -8964,7 +8962,7 @@ public final class L2PcInstance extends L2PlayableInstance
 		L2ItemInstance item;
 		IItemHandler handler;
 		
-		if (_activeSoulShots == null || _activeSoulShots.size() == 0)
+		if (_activeSoulShots == null || _activeSoulShots.isEmpty())
 			return;
 		
 		try
@@ -9205,7 +9203,7 @@ public final class L2PcInstance extends L2PlayableInstance
         if (getPet() != null)
             getPet().unSummon(this);
 
-        if (getCubics().size() > 0)
+        if (!getCubics().isEmpty())
         {
             for (L2CubicInstance cubic : getCubics().values())
             {
@@ -9909,7 +9907,7 @@ public final class L2PcInstance extends L2PlayableInstance
         if (getPet() instanceof L2SummonInstance)
         	getPet().unSummon(this);
 
-        if (getCubics().size() > 0)
+        if (!getCubics().isEmpty())
         {
             for (L2CubicInstance cubic : getCubics().values())
             {
@@ -10405,7 +10403,7 @@ public final class L2PcInstance extends L2PlayableInstance
 
 	public void broadcastSnoop(int type, String name, String _text)
 	{
-		if(_snoopListener.size() > 0)
+		if(!_snoopListener.isEmpty())
 		{
 			Snoop sn = new Snoop(getObjectId(),getName(),type,name,_text);
 
@@ -10848,7 +10846,7 @@ public final class L2PcInstance extends L2PlayableInstance
 		int group = GetRandomGroup();
 		int type = GetRandomFishType(group);
 		List<FishData> fishs = FishTable.getInstance().getfish(lvl, type, group);
-		if (fishs == null || fishs.size() == 0)
+		if (fishs == null || fishs.isEmpty())
 		{
 			sendMessage("Error - Fishes are not definied");
 			endFishing(false);

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2SepulcherNpcInstance.java

@@ -432,7 +432,7 @@ public class L2SepulcherNpcInstance extends L2NpcInstance
 	
 	public void sayInShout(String msg)
 	{
-		if (msg == null || msg == "")
+		if (msg == null || msg.isEmpty())
 			return;// wrong usage
 		Collection<L2PcInstance> knownPlayers = L2World.getInstance().getAllPlayers().values();
 		if (knownPlayers == null || knownPlayers.isEmpty())

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2VillageMasterInstance.java

@@ -80,37 +80,37 @@ public final class L2VillageMasterInstance extends L2FolkInstance
 
         if (actualCommand.equalsIgnoreCase("create_clan"))
         {
-            if (cmdParams.equals("")) return;
+            if (cmdParams.isEmpty()) return;
 
             ClanTable.getInstance().createClan(player, cmdParams);
         }
         else if (actualCommand.equalsIgnoreCase("create_academy"))
         {
-            if (cmdParams.equals("")) return;
+            if (cmdParams.isEmpty()) return;
 
             createSubPledge(player, cmdParams, null, L2Clan.SUBUNIT_ACADEMY, 5);
         }
         else if (actualCommand.equalsIgnoreCase("create_royal"))
         {
-            if (cmdParams.equals("")) return;
+            if (cmdParams.isEmpty()) return;
 
             createSubPledge(player, cmdParams, cmdParams2, L2Clan.SUBUNIT_ROYAL1, 6);
         }
         else if (actualCommand.equalsIgnoreCase("create_knight"))
         {
-            if (cmdParams.equals("")) return;
+            if (cmdParams.isEmpty()) return;
 
             createSubPledge(player, cmdParams, cmdParams2, L2Clan.SUBUNIT_KNIGHT1, 7);
         }
         else if (actualCommand.equalsIgnoreCase("assign_subpl_leader"))
         {
-            if (cmdParams.equals("")) return;
+            if (cmdParams.isEmpty()) return;
 
             assignSubPledgeLeader(player, cmdParams, cmdParams2);
         }
         else if (actualCommand.equalsIgnoreCase("create_ally"))
         {
-            if (cmdParams.equals("")) return;
+            if (cmdParams.isEmpty()) return;
 
             if (!player.isClanLeader())
             {
@@ -134,7 +134,7 @@ public final class L2VillageMasterInstance extends L2FolkInstance
         }
         else if (actualCommand.equalsIgnoreCase("change_clan_leader"))
         {
-            if (cmdParams.equals("")) return;
+            if (cmdParams.isEmpty()) return;
 
             changeClanLeader(player, cmdParams);
         }

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2WarehouseInstance.java

@@ -229,7 +229,7 @@ public final class L2WarehouseInstance extends L2FolkInstance
     private void showDepositWindowFreight(L2PcInstance player)
     {
         // No other chars in the account of this player
-        if (player.getAccountChars().size() == 0)
+        if (player.getAccountChars().isEmpty())
         {
             player.sendPacket(new SystemMessage(SystemMessageId.CHARACTER_DOES_NOT_EXIST));
         }
@@ -239,7 +239,7 @@ public final class L2WarehouseInstance extends L2FolkInstance
 
             Map<Integer, String> chars = player.getAccountChars();
 
-            if (chars.size() < 1)
+            if (chars.isEmpty())
             {
                 player.sendPacket(ActionFailed.STATIC_PACKET);
                 return;

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/knownlist/CharKnownList.java

@@ -202,7 +202,7 @@ public class CharKnownList extends ObjectKnownList
 
        Collection<L2Object> objs = getKnownObjects().values();
        //synchronized (getKnownObjects())
-       if (objs != null && objs.size() > 0)
+       if (objs != null && !objs.isEmpty())
        {
 			for (L2Object obj : objs)
 			{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/status/FolkStatus.java

@@ -38,13 +38,11 @@ public class FolkStatus extends NpcStatus
     @Override
 	public final void reduceHp(double value, L2Character attacker, boolean awake, boolean isDOT)
     {
-        return;
     }
     
     @Override
     public final void reduceMp(double value)
     {
-    	return;
     }
 
     @Override

L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Castle.java

@@ -1077,7 +1077,6 @@ public class Castle
 	public void setIsTimeRegistrationOver(boolean val)
 	{
 		_isTimeRegistrationOver = val;
-		return;
 	}
 	
 	public Calendar getTimeRegistrationOverDate()
@@ -1550,4 +1549,4 @@ public class Castle
 			}
 		}
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/entity/FortSiege.java

@@ -282,7 +282,7 @@ public class FortSiege
 				_siegeStartTask.cancel(true);
 			_siegeStartTask = null;
 			
-			if (getAttackerClans().size() <= 0)
+			if (getAttackerClans().isEmpty())
 			{
 				return;
 			}
@@ -574,12 +574,12 @@ public class FortSiege
 								text = "I feel so much grief that I can't even take care of myself. There isn't any reason for me to stay here any longer.";
 								break;
 						}
-						if (text != "")
+						if (!text.isEmpty())
 							instance.broadcastPacket(new NpcSay(instance.getObjectId(), 1, instance.getNpcId(), text));
 					}
     			}
 				_commanders.get(getFort().getFortId()).remove(spawn);
-				if (_commanders.get(getFort().getFortId()).size() == 0)
+				if (_commanders.get(getFort().getFortId()).isEmpty())
 				{
 					// spawn fort flags
 					spawnFlag(getFort().getFortId());
@@ -671,7 +671,7 @@ public class FortSiege
 			statement.close();
 			
 			loadSiegeClan();
-			if (getAttackerClans().size() == 0)
+			if (getAttackerClans().isEmpty())
 			{
 				if (getIsInProgress())
 					endSiege();

L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Hero.java

@@ -240,7 +240,7 @@ public class Hero
 		L2ItemInstance[] items;
 		InventoryUpdate iu;
 		
-		if (_heroes.size() != 0)
+		if (!_heroes.isEmpty())
 		{
 			for (StatsSet hero : _heroes.values())
 			{
@@ -316,7 +316,7 @@ public class Hero
 			}
 		}
 		
-		if (newHeroes.size() == 0)
+		if (newHeroes.isEmpty())
 		{
 			_heroes.clear();
 			return;
@@ -560,4 +560,4 @@ public class Hero
 			}
 		}
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/entity/Siege.java

@@ -331,7 +331,7 @@ public class Siege
 			if (getCastle().getOwnerId() > 0)
 				_siegeGuardManager.removeMercs(); // Remove all merc entry from db
 				
-			if (getDefenderClans().size() == 0 && // If defender doesn't exist (Pc vs Npc)
+			if (getDefenderClans().isEmpty() && // If defender doesn't exist (Pc vs Npc)
 					getAttackerClans().size() == 1 // Only 1 attacker
 			)
 			{
@@ -345,7 +345,7 @@ public class Siege
 			{
 				
 				int allyId = ClanTable.getInstance().getClan(getCastle().getOwnerId()).getAllyId();
-				if (getDefenderClans().size() == 0) // If defender doesn't exist (Pc vs Npc)
+				if (getDefenderClans().isEmpty()) // If defender doesn't exist (Pc vs Npc)
 				// and only an alliance attacks
 				{
 					// The player's clan is in an alliance
@@ -424,7 +424,7 @@ public class Siege
 	{
 		if (!getIsInProgress())
 		{
-			if (getAttackerClans().size() <= 0)
+			if (getAttackerClans().isEmpty())
 			{
 				SystemMessage sm;
 				if (getCastle().getOwnerId() <= 0)
@@ -1303,7 +1303,7 @@ public class Siege
 		
 		// Register guard to the closest Control Tower
 		// When CT dies, so do all the guards that it controls
-		if (getSiegeGuardManager().getSiegeGuardSpawn().size() > 0 && _controlTowers.size() > 0)
+		if (!getSiegeGuardManager().getSiegeGuardSpawn().isEmpty() && !_controlTowers.isEmpty())
 		{
 			L2ControlTowerInstance closestCt;
 			double distance, x, y, z;

L2_GameServer/java/net/sf/l2j/gameserver/model/entity/TvTEvent.java

@@ -171,7 +171,7 @@ public class TvTEvent
 		int balance[] = { 0, 0 }, priority = 0, highestLevelPlayerId;
 		L2PcInstance highestLevelPlayer;
 		// XXX: allParticipants should be sorted by level instead of using highestLevelPcInstanceOf for every fetch
-		while (allParticipants.size() > 0)
+		while (!allParticipants.isEmpty())
 		{
 			// Priority team gets one player
 			highestLevelPlayerId = highestLevelPcInstanceOf(allParticipants);
@@ -180,7 +180,7 @@ public class TvTEvent
 			_teams[priority].addPlayer(highestLevelPlayer);
 			balance[priority] += highestLevelPlayer.getLevel();
 			// Exiting if no more players
-			if (allParticipants.size() == 0) break;
+			if (allParticipants.isEmpty()) break;
 			// The other team gets one player
 			// XXX: Code not dry
 			priority = 1-priority;

L2_GameServer/java/net/sf/l2j/gameserver/model/itemcontainer/PcWarehouse.java

@@ -34,11 +34,11 @@ public class PcWarehouse extends Warehouse
 	public ItemLocation getBaseLocation() { return ItemLocation.WAREHOUSE; }
 	public String getLocationId() { return "0"; }
 	public int getLocationId(boolean dummy) { return 0; }
-	public void setLocationId(L2PcInstance dummy) { return; }
+	public void setLocationId(L2PcInstance dummy) {}
 
 	@Override
 	public boolean validateCapacity(int slots)
 	{
 		return (_items.size() + slots <= _owner.getWareHouseLimit());
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/model/olympiad/Olympiad.java

@@ -523,7 +523,7 @@ public class Olympiad
 			}
 		}
 		
-		if (result.size() > 0)
+		if (!result.isEmpty())
 		{
 			return result;
 		}
@@ -1269,7 +1269,7 @@ public class Olympiad
 	
 	protected void giveHeroBonus()
 	{
-		if (_heroesToBe.size() == 0)
+		if (_heroesToBe.isEmpty())
 			return;
 		
 		for (StatsSet hero : _heroesToBe)
@@ -1287,7 +1287,7 @@ public class Olympiad
 	
 	public int getNoblessePasses(int objId)
 	{
-		if (_period != 1 || _nobles.size() == 0)
+		if (_period != 1 || _nobles.isEmpty())
 			return 0;
 		
 		StatsSet noble = _nobles.get(objId);
@@ -1327,7 +1327,7 @@ public class Olympiad
 	
 	public int getNoblePoints(int objId)
 	{
-		if (_nobles.size() == 0)
+		if (_nobles.isEmpty())
 			return 0;
 		
 		StatsSet noble = _nobles.get(objId);
@@ -1340,7 +1340,7 @@ public class Olympiad
 	
 	public int getCompetitionDone(int objId)
 	{
-		if (_nobles.size() == 0)
+		if (_nobles.isEmpty())
 			return 0;
 		
 		StatsSet noble = _nobles.get(objId);
@@ -1353,7 +1353,7 @@ public class Olympiad
 
 	public int getCompetitionWon(int objId)
 	{
-		if (_nobles.size() == 0)
+		if (_nobles.isEmpty())
 			return 0;
 		
 		StatsSet noble = _nobles.get(objId);
@@ -1366,7 +1366,7 @@ public class Olympiad
 
 	public int getCompetitionLost(int objId)
 	{
-		if (_nobles.size() == 0)
+		if (_nobles.isEmpty())
 			return 0;
 		
 		StatsSet noble = _nobles.get(objId);

L2_GameServer/java/net/sf/l2j/gameserver/model/olympiad/OlympiadManager.java

@@ -315,7 +315,7 @@ class OlympiadManager implements Runnable
 			{
 			}
 			
-			if (_gamesQueue.size() == 0)
+			if (_gamesQueue.isEmpty())
 			{
 				allGamesTerminated = true;
 			}
@@ -338,7 +338,7 @@ class OlympiadManager implements Runnable
 	
 	protected OlympiadGame getOlympiadGame(int index)
 	{
-		if (_olympiadInstances != null && _olympiadInstances.size() > 0)
+		if (_olympiadInstances != null && !_olympiadInstances.isEmpty())
 		{
 			return _olympiadInstances.get(index);
 		}
@@ -347,7 +347,7 @@ class OlympiadManager implements Runnable
 	
 	protected void removeGame(OlympiadGame game)
 	{
-		if (_olympiadInstances != null && _olympiadInstances.size() > 0)
+		if (_olympiadInstances != null && !_olympiadInstances.isEmpty())
 		{
 			for (int i = 0; i < _olympiadInstances.size(); i++)
 			{
@@ -366,7 +366,7 @@ class OlympiadManager implements Runnable
 	
 	protected L2FastList<L2PcInstance> getRandomClassList(Map<Integer, L2FastList<L2PcInstance>> list, L2FastList<Integer> classList)
 	{
-		if (list == null || classList == null || list.size() == 0 || classList.size() == 0)
+		if (list == null || classList == null || list.isEmpty() || classList.isEmpty())
 			return null;
 
 		return list.get(classList.get(Rnd.nextInt(classList.size())));
@@ -376,7 +376,7 @@ class OlympiadManager implements Runnable
 	        L2FastList<L2PcInstance> list)
 	{
 		L2FastList<L2PcInstance> opponents = new L2FastList<L2PcInstance>();
-		if (list.size() == 0)
+		if (list.isEmpty())
 			return opponents;
 		int loopCount = (list.size() / 2);
 		
@@ -402,7 +402,7 @@ class OlympiadManager implements Runnable
 	{
 		if (list == null)
 			return false;
-		if (list.size() == 0)
+		if (list.isEmpty())
 			return false;
 		int loopCount = list.size() >> 1;
 		

L2_GameServer/java/net/sf/l2j/gameserver/model/quest/Quest.java

@@ -651,7 +651,7 @@ public class Quest extends ManagedScript
 	 */
 	public boolean showResult(L2PcInstance player, String res)
 	{
-		if (res == null || res.equals(""))
+		if (res == null || res.isEmpty())
 			return true;
 		if (res.endsWith(".htm"))
 		{
@@ -1230,7 +1230,7 @@ public class Quest extends ManagedScript
 		// NPE prevention.  If the player is null, there is nothing to return
 		if (player == null)
 			return null;
-		if ((player.getParty() == null) || (player.getParty().getPartyMembers().size() == 0))
+		if ((player.getParty() == null) || (player.getParty().getPartyMembers().isEmpty()))
 			return player;
 		L2Party party = player.getParty();
 		return party.getPartyMembers().get(Rnd.get(party.getPartyMembers().size()));
@@ -1277,7 +1277,7 @@ public class Quest extends ManagedScript
 		QuestState temp = null;
 		L2Party party = player.getParty();
 		// if this player is not in a party, just check if this player instance matches the conditions itself
-		if ((party == null) || (party.getPartyMembers().size() == 0))
+		if ((party == null) || (party.getPartyMembers().isEmpty()))
 		{
 			temp = player.getQuestState(getName());
 			if ((temp != null) && (temp.get(var) != null) && ((String) temp.get(var)).equalsIgnoreCase(value))
@@ -1302,7 +1302,7 @@ public class Quest extends ManagedScript
 				candidates.add(partyMember);
 		}
 		// if there was no match, return null...
-		if (candidates.size() == 0)
+		if (candidates.isEmpty())
 			return null;
 		
 		// if a match was found from the party, return one of them at random.
@@ -1329,7 +1329,7 @@ public class Quest extends ManagedScript
 		QuestState temp = null;
 		L2Party party = player.getParty();
 		// if this player is not in a party, just check if this player instance matches the conditions itself
-		if ((party == null) || (party.getPartyMembers().size() == 0))
+		if ((party == null) || (party.getPartyMembers().isEmpty()))
 		{
 			temp = player.getQuestState(getName());
 			if ((temp != null) && (temp.getState() == state))
@@ -1354,7 +1354,7 @@ public class Quest extends ManagedScript
 				candidates.add(partyMember);
 		}
 		// if there was no match, return null...
-		if (candidates.size() == 0)
+		if (candidates.isEmpty())
 			return null;
 		
 		// if a match was found from the party, return one of them at random.

L2_GameServer/java/net/sf/l2j/gameserver/model/quest/QuestState.java

@@ -212,7 +212,7 @@ public final class QuestState
 		else
 			Quest.createQuestVarInDb(this, var, val);
 		
-		if (var == "cond")
+		if ("cond".equals(var))
 		{
 			try
 			{

L2_GameServer/java/net/sf/l2j/gameserver/model/zone/type/L2BossZone.java

@@ -182,7 +182,7 @@ public class L2BossZone extends L2ZoneType
 			}
 			if (character instanceof L2PlayableInstance)
 			{
-				if (getCharactersInside() != null && getCharactersInside().size() > 0)
+				if (getCharactersInside() != null && !getCharactersInside().isEmpty())
 				{
 					_raidList.clear();
 					int count = 0;
@@ -349,4 +349,4 @@ public class L2BossZone extends L2ZoneType
 	public void onReviveInside(L2Character character)
 	{
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/gameserver/network/L2GameClient.java

@@ -488,7 +488,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>>
         for (int i = 0; i < chars.length; i++)
         {
             int objectId = chars[i].getObjectId();
-            _charSlotMapping.add(new Integer(objectId));
+            _charSlotMapping.add(Integer.valueOf(objectId));
         }
     }
 

L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestJoinAlly.java

@@ -82,7 +82,6 @@ public final class RequestJoinAlly extends L2GameClientPacket
 		sm = null;
 		AskJoinAlly aja = new AskJoinAlly(activeChar.getObjectId(), activeChar.getClan().getAllyName());
 		target.sendPacket(aja);
-		return;
 	}
 
 

L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -148,7 +148,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 					else if (fort != null && fort.getSiege().getIsInProgress())
 						siegeClan = fort.getSiege().getAttackerClan(activeChar.getClan());
 
-					if (siegeClan == null || siegeClan.getFlag().size() == 0)
+					if (siegeClan == null || siegeClan.getFlag().isEmpty())
 					{
 						_log.warning("Player ["+activeChar.getName()+"] called RestartPointPacket - To Siege HQ and he doesn't have Siege HQ!");
 						return;

L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/ConfirmDlg.java

@@ -57,15 +57,15 @@ public class ConfirmDlg extends L2GameServerPacket
 
 	public ConfirmDlg addString(String text)
 	{
-		_types.add(new Integer(TYPE_TEXT));
+		_types.add(Integer.valueOf(TYPE_TEXT));
 		_values.add(text);
 		return this;
 	}
 
 	public ConfirmDlg addNumber(int number)
 	{
-		_types.add(new Integer(TYPE_NUMBER));
-		_values.add(new Integer(number));
+		_types.add(Integer.valueOf(TYPE_NUMBER));
+		_values.add(Integer.valueOf(number));
 		return this;
 	}
 
@@ -104,8 +104,8 @@ public class ConfirmDlg extends L2GameServerPacket
 
 	public ConfirmDlg addNpcName(int id)
 	{
-		_types.add(new Integer(TYPE_NPC_NAME));
-		_values.add(new Integer(1000000 + id));
+		_types.add(Integer.valueOf(TYPE_NPC_NAME));
+		_values.add(Integer.valueOf(1000000 + id));
 		return this;
 	}
 
@@ -122,14 +122,14 @@ public class ConfirmDlg extends L2GameServerPacket
 
 	public ConfirmDlg addItemName(int id)
 	{
-		_types.add(new Integer(TYPE_ITEM_NAME));
-		_values.add(new Integer(id));
+		_types.add(Integer.valueOf(TYPE_ITEM_NAME));
+		_values.add(Integer.valueOf(id));
 		return this;
 	}
 
 	public ConfirmDlg addZoneName(int x, int y, int z)
 	{
-		_types.add(new Integer(TYPE_ZONE_NAME));
+		_types.add(Integer.valueOf(TYPE_ZONE_NAME));
 		int[] coord = {x, y, z};
 		_values.add(coord);
 		return this;
@@ -154,8 +154,8 @@ public class ConfirmDlg extends L2GameServerPacket
 
 	public ConfirmDlg addSkillName(int id, int lvl)
 	{
-		_types.add(new Integer(TYPE_SKILL_NAME));
-		_values.add(new Integer(id));
+		_types.add(Integer.valueOf(TYPE_SKILL_NAME));
+		_values.add(Integer.valueOf(id));
 		_skillLvL = lvl;
 		return this;
 	}
@@ -178,7 +178,7 @@ public class ConfirmDlg extends L2GameServerPacket
 		writeC(0xf3);
 		writeD(_messageId);
 
-		if (_types != null && _types.size() > 0)
+		if (_types != null && !_types.isEmpty())
 		{
 			writeD(_types.size());
 			for (int i = 0; i < _types.size(); i++)

L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/Die.java

@@ -112,7 +112,7 @@ public class Die extends L2GameServerPacket
             		isInCastleDefense? 0x01 : 0x00);             		// 6d 02 00 00 00 - to castle
             writeD(siegeClan != null &&
             	   !isInCastleDefense && ! isInFortDefense &&
-                   siegeClan.getFlag().size() > 0 ? 0x01 : 0x00);       // 6d 03 00 00 00 - to siege HQ
+                   !siegeClan.getFlag().isEmpty() ? 0x01 : 0x00);       // 6d 03 00 00 00 - to siege HQ
             writeD(_sweepable ? 0x01 : 0x00);                               // sweepable  (blue glow)
             writeD(_access.allowFixedRes() ? 0x01: 0x00);                  // 6d 04 00 00 00 - to FIXED
             writeD(_clan.getHasFort() > 0  || isInFortDefense? 0x01 : 0x00);    // 6d 05 00 00 00 - to fortress

L2_GameServer/java/net/sf/l2j/gameserver/network/serverpackets/SystemMessage.java

@@ -80,8 +80,8 @@ public final class SystemMessage extends L2GameServerPacket
 
 	public SystemMessage addFortId(int number)
 	{
-		_types.add(new Integer(TYPE_FORTRESS));
-		_values.add(new Integer(number));
+		_types.add(Integer.valueOf(TYPE_FORTRESS));
+		_values.add(Integer.valueOf(number));
 		return this;
 	}
 

L2_GameServer/java/net/sf/l2j/gameserver/skills/Formulas.java

@@ -1185,7 +1185,7 @@ public final class Formulas
 		if (siege == null || !siege.getIsInProgress()) return 0;
 
 		L2SiegeClan siegeClan = siege.getAttackerClan(activeChar.getClan().getClanId());
-		if (siegeClan == null || siegeClan.getFlag().size() == 0
+		if (siegeClan == null || siegeClan.getFlag().isEmpty()
 			|| !Util.checkIfInRange(200, activeChar, siegeClan.getFlag().get(0), true)) return 0;
 
 		return 1.5; // If all is true, then modifer will be 50% more

L2_GameServer/java/net/sf/l2j/gameserver/skills/effects/EffectConfuseMob.java

@@ -93,7 +93,7 @@ final class EffectConfuseMob extends L2Effect
 			}
 		}
 		// if there is no target, exit function
-		if (targetList.size() == 0)
+		if (targetList.isEmpty())
 		{
 			return true;
 		}

L2_GameServer/java/net/sf/l2j/gameserver/skills/effects/EffectConfusion.java

@@ -92,7 +92,7 @@ final class EffectConfusion extends L2Effect
 			}
 		}
 		// if there is no target, exit function
-		if (targetList.size() == 0)
+		if (targetList.isEmpty())
 		{
 			return true;
 		}

L2_GameServer/java/net/sf/l2j/gameserver/skills/effects/EffectSignetMDam.java

@@ -168,7 +168,7 @@ final class EffectSignetMDam extends L2Effect
 			}
 		}
 		
-		if (targets.size() > 0)
+		if (!targets.isEmpty())
 		{
 			caster.broadcastPacket(new MagicSkillLaunched(caster, getSkill().getId(), getSkill().getLevel(), targets.toArray(new L2Character[targets.size()])));
 			for (L2Character target : targets)

L2_GameServer/java/net/sf/l2j/gameserver/skills/funcs/FuncEnchant.java

@@ -171,6 +171,5 @@ public class FuncEnchant extends Func
                     break;
                 }
             }
-        return;
     }
 }

L2_GameServer/java/net/sf/l2j/gameserver/skills/l2skills/L2SkillSummon.java

@@ -105,7 +105,7 @@ public class L2SkillSummon extends L2Skill
 					int mastery = player.getSkillLevel(L2Skill.SKILL_CUBIC_MASTERY);
 					if (mastery < 0)
 						mastery = 0;
-                    if (mastery == 0 && player.getCubics().size() > 0)
+                    if (mastery == 0 && !player.getCubics().isEmpty())
 					{
 						//Player can have only 1 cubic - we shuld replace old cubic with new one
                         for (L2CubicInstance c: player.getCubics().values())

L2_GameServer/java/net/sf/l2j/gameserver/templates/chars/L2NpcTemplate.java

@@ -324,7 +324,7 @@ public final class L2NpcTemplate extends L2CharTemplate
 	{
 		if (_categories == null)
 			return;
-		while (_categories.size() > 0)
+		while (!_categories.isEmpty())
 		{
 			_categories.getFirst().clearAllDrops();
 			_categories.removeFirst();

L2_GameServer/java/net/sf/l2j/gameserver/templates/item/L2Item.java

@@ -502,7 +502,7 @@ public abstract class L2Item
 			if (f != null)
 				funcs.add(f);
 		}
-		if (funcs.size() == 0)
+		if (funcs.isEmpty())
 			return _emptyFunctionSet;
 		return funcs.toArray(new Func[funcs.size()]);
 	}
@@ -528,7 +528,7 @@ public abstract class L2Item
 			if (e != null)
 				effects.add(e);
 		}
-		if (effects.size() == 0)
+		if (effects.isEmpty())
 			return _emptyEffectSet;
 		return effects.toArray(new L2Effect[effects.size()]);
 	}
@@ -555,7 +555,7 @@ public abstract class L2Item
 			for (L2Effect e : skill.getEffects(caster, target))
 				effects.add(e);
 		}
-		if (effects.size() == 0)
+		if (effects.isEmpty())
 			return _emptyEffectSet;
 		return effects.toArray(new L2Effect[effects.size()]);
 	}

L2_GameServer/java/net/sf/l2j/gameserver/templates/item/L2Weapon.java

@@ -345,7 +345,7 @@ public final class L2Weapon extends L2Item
 			target.getFirstEffect(_skillsOnCrit.getId()).exit();
 		for (L2Effect e : _skillsOnCrit.getEffects(caster, target))
 			effects.add(e);
-		if (effects.size() == 0)
+		if (effects.isEmpty())
 			return _emptyEffectSet;
 		return effects.toArray(new L2Effect[effects.size()]);
 	}

L2_GameServer/java/net/sf/l2j/gameserver/util/MinionList.java

@@ -87,7 +87,7 @@ public class MinionList
 	
 	public boolean hasMinions()
 	{
-		return getSpawnedMinions().size() > 0;
+		return !getSpawnedMinions().isEmpty();
 	}
 	
 	public List<L2MinionInstance> getSpawnedMinions()

L2_GameServer/java/net/sf/l2j/gsregistering/GameServerRegister.java

@@ -85,7 +85,7 @@ public class GameServerRegister
 			{
 				try
 				{
-					int id = new Integer(_choice).intValue();
+					int id = Integer.parseInt(_choice);
 					int size = gameServerTable.getServerNames().size();
 
 					if (size == 0)
@@ -146,4 +146,4 @@ public class GameServerRegister
 			try { con.close();} catch (Exception e) {}
 		}
 	}
-}
+}

L2_GameServer/java/net/sf/l2j/loginserver/GameServerTable.java

@@ -115,7 +115,7 @@ public class GameServerTable
 				{
 					if(xpp.getLocalName().toString().equals("server"))
 					{
-						Integer id = new Integer(xpp.getAttributeValue(null,"id").toString());
+						Integer id = Integer.valueOf(xpp.getAttributeValue(null,"id").toString());
 						String name = xpp.getAttributeValue(null,"name").toString();
 						_serverNames.put(id,name);
 					}

L2_GameServer/java/net/sf/l2j/loginserver/crypt/BlowfishEngine.java

@@ -285,7 +285,6 @@ public class BlowfishEngine
         encrypting = pEncrypting;
         workingKey = key;
         setKey(workingKey);
-        return;
     }
 
     public String getAlgorithmName()

L2_GameServer/java/net/sf/l2j/status/GameStatusThread.java

@@ -356,7 +356,7 @@ public class GameStatusThread extends Thread
                             igm++;
                     }
                     _print.println("There are currently " + igm +" GM(s) online...");
-                    if ( gmList != "" ) _print.println(gmList);
+                    if (!gmList.isEmpty()) _print.println(gmList);
                 }
                 /*else if (_usrCommand.startsWith("unblock"))
                 {