BETA: Enabling some warnings, and respective fixes.

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

@@ -1,4 +1,4 @@
-#Sat Aug 27 20:52:36 CLST 2011
+#Tue Aug 30 10:23:21 UYT 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -47,7 +47,7 @@ org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
 org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
@@ -62,8 +62,8 @@ org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
 org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
 org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
 org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
 org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
 org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled

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

@@ -119,9 +119,7 @@ public class GeoEngine extends GeoData
 			return false;
 		if (cha.getZ() >= target.getZ())
 			return canSeeTarget(cha.getX(), cha.getY(), cha.getZ(), target.getX(), target.getY(), target.getZ());
-		else
-			return canSeeTarget(target.getX(), target.getY(), target.getZ(), cha.getX(), cha.getY(), cha.getZ());
-		
+		return canSeeTarget(target.getX(), target.getY(), target.getZ(), cha.getX(), cha.getY(), cha.getZ());
 	}
 	
 	/**
@@ -154,8 +152,7 @@ public class GeoEngine extends GeoData
 			z2 += 30; // well they don't move closer to balcony fence at the moment :(
 		if (cha.getZ() >= target.getZ())
 			return canSeeTarget(cha.getX(), cha.getY(), z, target.getX(), target.getY(), z2);
-		else
-			return canSeeTarget(target.getX(), target.getY(), z2, cha.getX(), cha.getY(), z);
+		return canSeeTarget(target.getX(), target.getY(), z2, cha.getX(), cha.getY(), z);
 	}
 	
 	/**
@@ -175,8 +172,7 @@ public class GeoEngine extends GeoData
 		
 		if (gm.getZ() >= target.getZ())
 			return canSeeDebug(gm, (gm.getX() - L2World.MAP_MIN_X) >> 4, (gm.getY() - L2World.MAP_MIN_Y) >> 4, z, (target.getX() - L2World.MAP_MIN_X) >> 4, (target.getY() - L2World.MAP_MIN_Y) >> 4, z2);
-		else
-			return canSeeDebug(gm, (target.getX() - L2World.MAP_MIN_X) >> 4, (target.getY() - L2World.MAP_MIN_Y) >> 4, z2, (gm.getX() - L2World.MAP_MIN_X) >> 4, (gm.getY() - L2World.MAP_MIN_Y) >> 4, z);
+		return canSeeDebug(gm, (target.getX() - L2World.MAP_MIN_X) >> 4, (target.getY() - L2World.MAP_MIN_Y) >> 4, z2, (gm.getX() - L2World.MAP_MIN_X) >> 4, (gm.getY() - L2World.MAP_MIN_Y) >> 4, z);
 	}
 	
 	/**
@@ -556,15 +552,15 @@ public class GeoEngine extends GeoData
 					tempz = nCanMoveNext(x, y, (int) z, next_x, next_y, tz);
 					if (tempz == Double.MIN_VALUE)
 						return new Location((x << 4) + L2World.MAP_MIN_X, (y << 4) + L2World.MAP_MIN_Y, (int) z);
-					else
-						z = tempz;
+					
+					z = tempz;
 					next_y += inc_y;
 					//_log.warning("2: next_x:"+next_x+" next_y"+next_y);
 					tempz = nCanMoveNext(next_x, y, (int) z, next_x, next_y, tz);
 					if (tempz == Double.MIN_VALUE)
 						return new Location((x << 4) + L2World.MAP_MIN_X, (y << 4) + L2World.MAP_MIN_Y, (int) z);
-					else
-						z = tempz;
+					
+					z = tempz;
 				}
 				else
 				{
@@ -574,8 +570,8 @@ public class GeoEngine extends GeoData
 					tempz = nCanMoveNext(x, y, (int) z, next_x, next_y, tz);
 					if (tempz == Double.MIN_VALUE)
 						return new Location((x << 4) + L2World.MAP_MIN_X, (y << 4) + L2World.MAP_MIN_Y, (int) z);
-					else
-						z = tempz;
+					
+					z = tempz;
 				}
 			}
 		}
@@ -595,15 +591,15 @@ public class GeoEngine extends GeoData
 					tempz = nCanMoveNext(x, y, (int) z, next_x, next_y, tz);
 					if (tempz == Double.MIN_VALUE)
 						return new Location((x << 4) + L2World.MAP_MIN_X, (y << 4) + L2World.MAP_MIN_Y, (int) z);
-					else
-						z = tempz;
+					
+					z = tempz;
 					next_x += inc_x;
 					//_log.warning("5: next_x:"+next_x+" next_y"+next_y);
 					tempz = nCanMoveNext(x, next_y, (int) z, next_x, next_y, tz);
 					if (tempz == Double.MIN_VALUE)
 						return new Location((x << 4) + L2World.MAP_MIN_X, (y << 4) + L2World.MAP_MIN_Y, (int) z);
-					else
-						z = tempz;
+
+					z = tempz;
 				}
 				else
 				{
@@ -613,23 +609,23 @@ public class GeoEngine extends GeoData
 					tempz = nCanMoveNext(x, y, (int) z, next_x, next_y, tz);
 					if (tempz == Double.MIN_VALUE)
 						return new Location((x << 4) + L2World.MAP_MIN_X, (y << 4) + L2World.MAP_MIN_Y, (int) z);
-					else
-						z = tempz;
+					
+					z = tempz;
 				}
 			}
 		}
 		if (z == startpoint.getZ()) // geodata hasn't modified Z in any coordinate, i.e. doesn't exist
 			return destiny;
-		else
-			return new Location(destiny.getX(), destiny.getY(), (int) z);
+		
+		return new Location(destiny.getX(), destiny.getY(), (int) z);
 	}
 	
 	private static byte sign(int x)
 	{
 		if (x >= 0)
 			return +1;
-		else
-			return -1;
+		
+		return -1;
 	}
 	
 	//GeoEngine
@@ -1136,8 +1132,7 @@ public class GeoEngine extends GeoData
 			height = (short) (height >> 1); //height / 2
 			if (checkNSWE(NSWE, x, y, tx, ty))
 				return height;
-			else
-				return Double.MIN_VALUE;
+			return Double.MIN_VALUE;
 		}
 		else
 			//multilevel, type == 2
@@ -1180,8 +1175,7 @@ public class GeoEngine extends GeoData
 			}
 			if (checkNSWE(NSWE, x, y, tx, ty))
 				return tempz;
-			else
-				return Double.MIN_VALUE;
+			return Double.MIN_VALUE;
 		}
 	}
 	
@@ -1228,8 +1222,7 @@ public class GeoEngine extends GeoData
 				_log.warning("flatheight:" + height);
 			if (z > height)
 				return z+inc_z > height;
-				else
-					return z+inc_z < height;
+			return z+inc_z < height;
 		}
 		else if (type == 1) //complex
 		{
@@ -1246,10 +1239,8 @@ public class GeoEngine extends GeoData
 					_log.warning("height:" + height + " z" + z);
 				if (z < nGetUpperHeight(x + inc_x, y + inc_y, height))
 					return false; // an obstacle high enough
-				return true;
 			}
-			else
-				return true;
+			return true;
 		}
 		else
 			//multilevel, type == 2
@@ -1291,11 +1282,9 @@ public class GeoEngine extends GeoData
 					NSWE = (short) (NSWE & 0x0F);
 					break;
 				}
-				else
-				{
-					highestlayer = false;
-					upperHeight = tempZ;
-				}
+				
+				highestlayer = false;
+				upperHeight = tempZ;
 				
 				temp_layers--;
 				index += 2;
@@ -1324,20 +1313,16 @@ public class GeoEngine extends GeoData
 					// check one inc_x inc_y further, for the height there
 					if (z < nGetUpperHeight(x + inc_x, y + inc_y, lowerHeight))
 						return false; // a wall
-					return true; // we see over it, e.g. a fence
 				}
-				else
-					return true;
+				return true;
 			}
 			if (!checkNSWE(NSWE, x, y, x + inc_x, y + inc_y))
 			{
 				// check one inc_x inc_y further, for the height there
 				if (z < nGetUpperHeight(x + inc_x, y + inc_y, lowerHeight))
 					return false; // we hit an obstacle high enough
-				return true;
 			}
-			else
-				return true;
+			return true;
 		}
 	}
 	

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

@@ -50,10 +50,6 @@ import com.l2jserver.gameserver.util.Broadcast;
 
 /**
  *  Seven Signs Engine
- *
- * 
- * 
- *
  *  @author Tempy
  */
 public class SevenSigns
@@ -247,8 +243,7 @@ public class SevenSigns
 		// because of previous "date" column usage, check only if it already contains usable data for us
 		if (_lastSave.getTimeInMillis() > 7 && _lastSave.before(lastPeriodChange))
 			return true;
-		else
-			return false;
+		return false;
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/AbstractAI.java

@@ -46,7 +46,6 @@ import com.l2jserver.gameserver.taskmanager.AttackStanceTaskManager;
  *
  * AbastractAI :<BR><BR>
  * <li>L2CharacterAI</li><BR><BR>
- *
  */
 abstract class AbstractAI implements Ctrl
 {
@@ -895,7 +894,6 @@ abstract class AbstractAI implements Ctrl
 	{
 		if (_actor == null)
 			return "Actor: null";
-		else
-			return "Actor: "+_actor;
+		return "Actor: " + _actor;
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -60,7 +60,6 @@ import com.l2jserver.util.Rnd;
  */
 public class L2AttackableAI extends L2CharacterAI implements Runnable
 {
-	
 	//protected static final Logger _log = Logger.getLogger(L2AttackableAI.class.getName());
 	
 	private static final int RANDOM_WALK_RATE = 30; // confirmed
@@ -250,8 +249,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			// Check if the L2PcInstance target has karma (=PK)
 			if (target instanceof L2PcInstance && ((L2PcInstance) target).getKarma() > 0)
 				return GeoData.getInstance().canSeeTarget(me, target); // Los Check
-			else
-				return false;
+			return false;
 		}
 		else
 		{
@@ -269,8 +267,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						return GeoData.getInstance().canSeeTarget(getActiveChar(), target);
 					}
-					else
-						return false;
+					return false;
 				}
 				if (getActiveChar().getIsChaos() > 0 && me.isInsideRadius(target, getActiveChar().getIsChaos(), false, false))
 				{
@@ -787,14 +784,12 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				{
 					return;
 				}
-				else
+				
+				for (L2Skill sk : _skillrender.getSuicideSkills())
 				{
-					for (L2Skill sk : _skillrender.getSuicideSkills())
+					if (cast(sk))
 					{
-						if (cast(sk))
-						{
-							return;
-						}
+						return;
 					}
 				}
 			}
@@ -1145,7 +1140,6 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			if (npc.isMovementDisabled())
 			{
 				targetReconsider();
-				return;
 			}
 			else
 			{
@@ -1154,14 +1148,12 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				if (range < 5)
 					range = 5;
 				moveToPawn(getAttackTarget(), range);
-				return;
+				
 			}
-		}
-		else
-		{
-			melee(npc.getPrimarySkillId());
+			return;
 		}
 		
+		melee(npc.getPrimarySkillId());
 	}
 	
 	private void melee(int type)
@@ -1674,18 +1666,16 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						caster.doCast(sk);
 						return true;
 					}
-					else
+					
+					L2Character target = skillTargetReconsider(sk);
+					if (target != null)
 					{
-						L2Character target = skillTargetReconsider(sk);
-						if (target != null)
-						{
-							clientStopMoving(null);
-							L2Object targets = attackTarget;
-							caster.setTarget(target);
-							caster.doCast(sk);
-							caster.setTarget(targets);
-							return true;
-						}
+						clientStopMoving(null);
+						L2Object targets = attackTarget;
+						caster.setTarget(target);
+						caster.doCast(sk);
+						caster.setTarget(targets);
+						return true;
 					}
 				}
 				else
@@ -1707,18 +1697,16 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						caster.doCast(sk);
 						return true;
 					}
-					else
+					
+					L2Character target = skillTargetReconsider(sk);
+					if (target != null)
 					{
-						L2Character target = skillTargetReconsider(sk);
-						if (target != null)
-						{
-							clientStopMoving(null);
-							L2Object targets = attackTarget;
-							caster.setTarget(target);
-							caster.doCast(sk);
-							caster.setTarget(targets);
-							return true;
-						}
+						clientStopMoving(null);
+						L2Object targets = attackTarget;
+						caster.setTarget(target);
+						caster.doCast(sk);
+						caster.setTarget(targets);
+						return true;
 					}
 				}
 				else
@@ -2052,7 +2040,6 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					}
 				}
 			}
-			return null;
 		}
 		else
 		{
@@ -2098,8 +2085,8 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					}
 				}
 			}
-			return null;
 		}
+		return null;
 	}
 	
 	private L2Character skillTargetReconsider(L2Skill sk)
@@ -2170,15 +2157,14 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						if (((L2Attackable) obj).getFactionId() != null && ((L2Attackable) obj).getFactionId().equals(actor.getFactionId()))
 							continue;
-						else
-							return obj;
+						
+						return obj;
 					}
 				}
 				if (obj instanceof L2Summon)
 				{
 					return obj;
 				}
-				
 			}
 		}
 		return null;
@@ -2252,15 +2238,13 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						if (((L2Attackable) obj).getFactionId() != null && ((L2Attackable) obj).getFactionId().equals(actor.getFactionId()))
 							continue;
+						
+						if (MostHate != null)
+							actor.addDamageHate(obj, 0, actor.getHating(MostHate));
 						else
-						{
-							if (MostHate != null)
-								actor.addDamageHate(obj, 0, actor.getHating(MostHate));
-							else
-								actor.addDamageHate(obj, 0, 2000);
-							actor.setTarget(obj);
-							setAttackTarget(obj);
-						}
+							actor.addDamageHate(obj, 0, 2000);
+						actor.setTarget(obj);
+						setAttackTarget(obj);
 					}
 				}
 				else if (obj instanceof L2Summon)
@@ -2354,15 +2338,13 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						if (((L2Attackable) obj).getFactionId() != null && ((L2Attackable) obj).getFactionId().equals(actor.getFactionId()))
 							continue;
+						
+						if (MostHate != null)
+							actor.addDamageHate(obj, 0, actor.getHating(MostHate));
 						else
-						{
-							if (MostHate != null)
-								actor.addDamageHate(obj, 0, actor.getHating(MostHate));
-							else
-								actor.addDamageHate(obj, 0, 2000);
-							actor.setTarget(obj);
-							setAttackTarget(obj);
-						}
+							actor.addDamageHate(obj, 0, 2000);
+						actor.setTarget(obj);
+						setAttackTarget(obj);
 					}
 				}
 				else if (obj instanceof L2Summon)

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2FortSiegeGuardAI.java

@@ -43,10 +43,8 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
-
 /**
- * This class manages AI of L2Attackable.<BR><BR>
- *
+ * This class manages AI of L2Attackable.
  */
 public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 {
@@ -847,9 +845,9 @@ public class L2FortSiegeGuardAI extends L2CharacterAI implements Runnable
 				_globalAggro = -25;
 				return;
 			}
-			else
-				for (L2Character aggroed : me.getAggroList().keySet())
-					me.addDamageHate(aggroed, 0, aggro);
+			
+			for (L2Character aggroed : me.getAggroList().keySet())
+				me.addDamageHate(aggroed, 0, aggro);
 			
 			aggro = me.getHating(mostHated);
 			if (aggro <= 0)

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2SiegeGuardAI.java

@@ -40,14 +40,11 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
-
 /**
- * This class manages AI of L2Attackable.<BR><BR>
- *
+ * This class manages AI of L2Attackable.
  */
 public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 {
-	
 	//protected static final Logger _log = Logger.getLogger(L2SiegeGuardAI.class.getName());
 	
 	private static final int MAX_ATTACK_TIMEOUT = 300; // int ticks, i.e. 30 seconds
@@ -822,9 +819,9 @@ public class L2SiegeGuardAI extends L2CharacterAI implements Runnable
 				_globalAggro = -25;
 				return;
 			}
-			else
-				for (L2Character aggroed : me.getAggroList().keySet())
-					me.addDamageHate(aggroed, 0, aggro);
+			
+			for (L2Character aggroed : me.getAggroList().keySet())
+				me.addDamageHate(aggroed, 0, aggro);
 			
 			aggro = me.getHating(mostHated);
 			if (aggro <= 0)

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

@@ -45,10 +45,6 @@ public class RegionBBSManager extends BaseBBSManager
 	{
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.communitybbs.Manager.BaseBBSManager#parsecmd(java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
-	 */
 	@Override
 	public void parsecmd(String command, L2PcInstance activeChar)
 	{
@@ -543,8 +539,8 @@ public class RegionBBSManager extends BaseBBSManager
 	{
 		if (type.equalsIgnoreCase("gm"))
 			return _onlineCountGm;
-		else
-			return _onlineCount;
+		
+		return _onlineCount;
 	}
 	
 	private FastList<L2PcInstance> getOnlinePlayers(int page)
@@ -556,8 +552,8 @@ public class RegionBBSManager extends BaseBBSManager
 	{
 		if (_communityPages.get(page) != null)
 			return _communityPages.get(page).get(type);
-		else
-			return null;
+		
+		return null;
 	}
 	
 	@SuppressWarnings("synthetic-access")

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

@@ -30,7 +30,6 @@ import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * This class ...
  *
@@ -186,8 +185,8 @@ public class CharNameTable
 	{
 		if (getNameById(objectId) != null)
 			return _accessLevels.get(objectId);
-		else
-			return 0;
+		
+		return 0;
 	}
 	
 	public synchronized boolean doesCharNameExist(String name)

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

@@ -36,7 +36,6 @@ import com.l2jserver.gameserver.skills.funcs.LambdaConst;
 import com.l2jserver.gameserver.templates.item.L2Item;
 
 /**
- *
  * @author  MrPoke
  */
 public class EnchantHPBonusData
@@ -185,8 +184,8 @@ public class EnchantHPBonusData
 		
 		if (item.getItem().getBodyPart() == L2Item.SLOT_FULL_ARMOR)
 			return (int) (values[Math.min(item.getOlyEnchantLevel(), values.length) - 1] * fullArmorModifier);
-		else
-			return values[Math.min(item.getOlyEnchantLevel(), values.length) - 1];
+		
+		return values[Math.min(item.getOlyEnchantLevel(), values.length) - 1];
 	}
 	
 	@SuppressWarnings("synthetic-access")

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

@@ -247,8 +247,8 @@ public class ItemTable
 	{
 		if (id >= _allTemplates.length)
 			return null;
-		else
-			return _allTemplates[id];
+		
+		return _allTemplates[id];
 	}
 	
 	/**

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

@@ -36,7 +36,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
 import com.l2jserver.gameserver.model.entity.Castle;
 
 /**
- *
  * @author  KenM
  */
 public class MerchantPriceConfigTable implements InstanceListManager
@@ -91,10 +90,8 @@ public class MerchantPriceConfigTable implements InstanceListManager
 			{
 				throw new IllegalStateException("merchantPriceConfig must define an 'defaultPriceConfig'");
 			}
-			else
-			{
-				defaultPriceConfigId = Integer.parseInt(dpcNode.getNodeValue());
-			}
+			defaultPriceConfigId = Integer.parseInt(dpcNode.getNodeValue());
+			
 			MerchantPriceConfig mpc;
 			for (n = n.getFirstChild(); n != null; n = n.getNextSibling())
 			{
@@ -129,30 +126,21 @@ public class MerchantPriceConfigTable implements InstanceListManager
 			{
 				throw new IllegalStateException("Must define the priceConfig 'id'");
 			}
-			else
-			{
-				id = Integer.parseInt(node.getNodeValue());
-			}
+			id = Integer.parseInt(node.getNodeValue());
 			
 			node = n.getAttributes().getNamedItem("name");
 			if (node == null)
 			{
 				throw new IllegalStateException("Must define the priceConfig 'name'");
 			}
-			else
-			{
-				name = node.getNodeValue();
-			}
+			name = node.getNodeValue();
 			
 			node = n.getAttributes().getNamedItem("baseTax");
 			if (node == null)
 			{
 				throw new IllegalStateException("Must define the priceConfig 'baseTax'");
 			}
-			else
-			{
-				baseTax = Integer.parseInt(node.getNodeValue());
-			}
+			baseTax = Integer.parseInt(node.getNodeValue());
 			
 			node = n.getAttributes().getNamedItem("castleId");
 			if (node != null)

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

@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.model.entity.ClanHall;
 import com.l2jserver.gameserver.model.zone.type.L2ClanHallZone;
 
 /**
- *
  * @author  Steuf
  */
 public class ClanHallManager
@@ -109,8 +108,7 @@ public class ClanHallManager
 						owner.setHasHideout(id);
 						continue;
 					}
-					else
-						ch.free();
+					ch.free();
 				}
 				_freeClanHall.put(id, ch);
 				

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

@@ -28,11 +28,8 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2RaidBossInstance;
 
 /**
- *
- * @version $Revision: $ $Date: $
  * @author  godson
  */
-
 public class DayNightSpawnManager
 {
 	
@@ -241,9 +238,8 @@ public class DayNightSpawnManager
 			
 			return raidboss;
 		}
-		else
-			_bosses.put(spawnDat, null);
 		
+		_bosses.put(spawnDat, null);
 		return null;
 	}
 	

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

@@ -54,7 +54,6 @@ import com.l2jserver.util.Rnd;
  */
 public class DimensionalRiftManager
 {
-	
 	private static Logger _log = Logger.getLogger(DimensionalRiftManager.class.getName());
 	private TByteObjectHashMap<TByteObjectHashMap<DimensionalRiftRoom>> _rooms = new TByteObjectHashMap<TByteObjectHashMap<DimensionalRiftRoom>>(7);
 	private final int DIMENSIONAL_FRAGMENT_ITEM_ID = 7079;
@@ -252,8 +251,8 @@ public class DimensionalRiftManager
 	{
 		if (ignorePeaceZone)
 			return _rooms.get((byte) 0).get((byte) 1).checkIfInZone(x, y, z);
-		else
-			return _rooms.get((byte) 0).get((byte) 1).checkIfInZone(x, y, z) && !_rooms.get((byte) 0).get((byte) 0).checkIfInZone(x, y, z);
+		
+		return _rooms.get((byte) 0).get((byte) 1).checkIfInZone(x, y, z) && !_rooms.get((byte) 0).get((byte) 0).checkIfInZone(x, y, z);
 	}
 	
 	public boolean checkIfInPeaceZone(int x, int y, int z)

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

@@ -257,18 +257,14 @@ public class FortSiegeManager
 		{
 			return _commanderSpawnList.get(_fortId);
 		}
-		else
-		{
-			return null;
-		}
+		return null;
 	}
 	
 	public final FastList<CombatFlag> getFlagList(int _fortId)
 	{
 		if (_flagList.containsKey(_fortId))
 			return _flagList.get(_fortId);
-		else
-			return null;
+		return null;
 	}
 	
 	public final int getAttackerMaxClans()

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

@@ -47,7 +47,6 @@ import javolution.util.FastMap;
 
 /**
  * @author Nyaran
- *
  */
 public class MapRegionManager
 {
@@ -304,8 +303,7 @@ public class MapRegionManager
 						{
 							if (player.getKarma() > 0)
 								return zone.getChaoticSpawnLoc();
-							else
-								return zone.getSpawnLoc();
+							return zone.getSpawnLoc();
 						}
 					}
 				}
@@ -327,8 +325,7 @@ public class MapRegionManager
 					{
 						if (player.getKarma() > 0)
 							return castle.getCastleZone().getChaoticSpawnLoc();
-						else
-							return castle.getCastleZone().getSpawnLoc();
+						return castle.getCastleZone().getSpawnLoc();
 					}
 				}
 				
@@ -349,8 +346,7 @@ public class MapRegionManager
 					{
 						if (player.getKarma() > 0)
 							return fort.getFortZone().getChaoticSpawnLoc();
-						else
-							return fort.getFortZone().getSpawnLoc();
+						return fort.getFortZone().getSpawnLoc();
 					}
 				}
 				
@@ -422,15 +418,13 @@ public class MapRegionManager
 					L2RespawnZone zone = ZoneManager.getInstance().getZone(player, L2RespawnZone.class);
 					if (zone != null)
 						return getRestartRegion(activeChar, zone.getRespawnPoint((L2PcInstance) activeChar)).getChaoticSpawnLoc();
-					else
-						return getMapRegion(activeChar).getChaoticSpawnLoc();
+					return getMapRegion(activeChar).getChaoticSpawnLoc();
 				}
 				catch (Exception e)
 				{
 					if (player.isFlyingMounted()) // prevent flying players to teleport outside of gracia
 						return _regions.get("union_base_of_kserth").getChaoticSpawnLoc();
-					else
-						return _regions.get("talking_island_town").getChaoticSpawnLoc();
+					return _regions.get("talking_island_town").getChaoticSpawnLoc();
 				}
 			}
 			
@@ -465,8 +459,7 @@ public class MapRegionManager
 			L2RespawnZone zone = ZoneManager.getInstance().getZone(activeChar, L2RespawnZone.class);
 			if (zone != null)
 				return getRestartRegion(activeChar, zone.getRespawnPoint((L2PcInstance) activeChar)).getSpawnLoc();
-			else
-				return getMapRegion(activeChar).getSpawnLoc();
+			return getMapRegion(activeChar).getSpawnLoc();
 		}
 		catch (Exception e)
 		{

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

@@ -173,8 +173,10 @@ public class TerritoryWarManager implements Siegable
 	{
 		if (clan == null)
 			return false;
-		else if (clan.getHasCastle() > 0)
-			return (castleId == -1 ? true:(clan.getHasCastle() == castleId));
+		
+		if (clan.getHasCastle() > 0)
+			return (castleId == -1 ? true : (clan.getHasCastle() == castleId));
+		
 		if (castleId == -1)
 		{
 			for(int cId:_registeredClans.keySet())
@@ -182,8 +184,7 @@ public class TerritoryWarManager implements Siegable
 					return true;
 			return false;
 		}
-		else
-			return _registeredClans.get(castleId).contains(clan);
+		return _registeredClans.get(castleId).contains(clan);
 	}
 	
 	/**
@@ -199,8 +200,7 @@ public class TerritoryWarManager implements Siegable
 					return true;
 			return false;
 		}
-		else
-			return _registeredMercenaries.get(castleId).contains(objId);
+		return _registeredMercenaries.get(castleId).contains(objId);
 	}
 	
 	public Territory getTerritory(int castleId)
@@ -644,14 +644,13 @@ public class TerritoryWarManager implements Siegable
 			catch (Exception e)
 			{
 				_log.log(Level.WARNING, "Territory War Manager: " + e.getMessage(), e);
-				return null;
 			}
 		}
 		else
 		{
 			_log.warning("Territory War Manager: Data missing in NPC table for ID: " + npcId + ".");
-			return null;
 		}
+		return null;
 	}
 	
 	private void changeRegistration(int castleId, int objId, boolean delete)

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

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.L2Transformation;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- *
  * @author  KenM
  */
 public class TransformationManager
@@ -55,10 +54,7 @@ public class TransformationManager
 			trans.start();
 			return true;
 		}
-		else
-		{
-			return false;
-		}
+		return false;
 	}
 	
 	public L2Transformation getTransformationById(int id)

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

@@ -656,10 +656,8 @@ public class ZoneManager
 					zone = temp;
 				}
 			}
-			return zone;
 		}
-		else
-			return zone;
+		return zone;
 	}
 	
 	/**

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

@@ -238,10 +238,10 @@ public class AutoChatHandler implements SpawnListener
 	{
 		if (!byObjectId)
 			return _registeredChats.get(id);
-		else
-			for (AutoChatInstance chatInst : _registeredChats.values())
-				if (chatInst.getChatDefinition(id) != null)
-					return chatInst;
+		
+		for (AutoChatInstance chatInst : _registeredChats.values())
+			if (chatInst.getChatDefinition(id) != null)
+				return chatInst;
 		
 		return null;
 	}
@@ -611,16 +611,16 @@ public class AutoChatHandler implements SpawnListener
 			{
 				if (_chatTexts != null)
 					return _chatTexts;
-				else
-					return _chatInstance.getDefaultTexts();
+				
+				return _chatInstance.getDefaultTexts();
 			}
 			
 			private long getChatDelay()
 			{
 				if (_chatDelay > 0)
 					return _chatDelay;
-				else
-					return _chatInstance.getDefaultDelay();
+				
+				return _chatInstance.getDefaultDelay();
 			}
 			
 			private boolean isActive()

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

@@ -155,8 +155,8 @@ public class CharEffectList
 				{
 					if (e.getInUse())
 						return e;
-					else
-						effectNotInUse = e;
+					
+					effectNotInUse = e;
 				}
 			}
 		}
@@ -171,8 +171,8 @@ public class CharEffectList
 				{
 					if (e.getInUse())
 						return e;
-					else
-						effectNotInUse = e;
+					
+					effectNotInUse = e;
 				}
 			}
 		}
@@ -201,8 +201,8 @@ public class CharEffectList
 					{
 						if (e.getInUse())
 							return e;
-						else
-							effectNotInUse = e;
+						
+						effectNotInUse = e;
 					}
 				}
 			}
@@ -220,13 +220,12 @@ public class CharEffectList
 					{
 						if (e.getInUse())
 							return e;
-						else
-							effectNotInUse = e;
+						
+						effectNotInUse = e;
 					}
 				}
 			}
 		}
-		
 		return effectNotInUse;
 	}
 	
@@ -250,8 +249,8 @@ public class CharEffectList
 				{
 					if (e.getInUse())
 						return e;
-					else
-						effectNotInUse = e;
+					
+					effectNotInUse = e;
 				}
 			}
 		}
@@ -266,12 +265,11 @@ public class CharEffectList
 				{
 					if (e.getInUse())
 						return e;
-					else
-						effectNotInUse = e;
+					
+					effectNotInUse = e;
 				}
 			}
 		}
-		
 		return effectNotInUse;
 	}
 	

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

@@ -44,7 +44,6 @@ import com.l2jserver.gameserver.util.Broadcast;
 import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 
-
 public class CursedWeapon
 {
 	private static final Logger _log = Logger.getLogger(CursedWeaponsManager.class.getName());
@@ -674,13 +673,11 @@ public class CursedWeapon
 	}
 	public int getLevel()
 	{
-		if (_nbKills > _stageKills*_skillMaxLevel)
+		if (_nbKills > _stageKills * _skillMaxLevel)
 		{
 			return _skillMaxLevel;
-		} else
-		{
-			return (_nbKills / _stageKills);
-		}
+		} 
+		return (_nbKills / _stageKills);
 	}
 	public long getTimeLeft()
 	{

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

@@ -1701,48 +1701,46 @@ public class L2Clan
 			player.sendPacket(sp);
 			return null;
 		}
-		else
+		
+		Connection con = null;
+		try
 		{
-			Connection con = null;
-			try
+			con = L2DatabaseFactory.getInstance().getConnection();
+			final PreparedStatement statement = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)");
+			statement.setInt(1, getClanId());
+			statement.setInt(2, pledgeType);
+			statement.setString(3, subPledgeName);
+			if (pledgeType != -1)
+				statement.setInt(4, leaderId);
+			else
+				statement.setInt(4, 0);
+			statement.execute();
+			statement.close();
+			
+			subPledge = new SubPledge(pledgeType, subPledgeName, leaderId);
+			_subPledges.put(pledgeType, subPledge);
+			
+			if (pledgeType != -1)
 			{
-				con = L2DatabaseFactory.getInstance().getConnection();
-				final PreparedStatement statement = con.prepareStatement("INSERT INTO clan_subpledges (clan_id,sub_pledge_id,name,leader_id) values (?,?,?,?)");
-				statement.setInt(1, getClanId());
-				statement.setInt(2, pledgeType);
-				statement.setString(3, subPledgeName);
-				if (pledgeType != -1)
-					statement.setInt(4, leaderId);
+				// Royal Guard 5000 points per each
+				// Order of Knights 10000 points per each
+				if (pledgeType < L2Clan.SUBUNIT_KNIGHT1)
+					setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true);
 				else
-					statement.setInt(4, 0);
-				statement.execute();
-				statement.close();
-				
-				subPledge = new SubPledge(pledgeType, subPledgeName, leaderId);
-				_subPledges.put(pledgeType, subPledge);
-				
-				if (pledgeType != -1)
-				{
-					// Royal Guard 5000 points per each
-					// Order of Knights 10000 points per each
-					if (pledgeType < L2Clan.SUBUNIT_KNIGHT1)
-						setReputationScore(getReputationScore() - Config.ROYAL_GUARD_COST, true);
-					else
-						setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true);
-					//TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST
-				}
-				
-				if (Config.DEBUG)
-					_log.fine("New sub_clan saved in db: " + getClanId() + "; " + pledgeType);
-			}
-			catch (Exception e)
-			{
-				_log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e);
-			}
-			finally
-			{
-				L2DatabaseFactory.close(con);
+					setReputationScore(getReputationScore() - Config.KNIGHT_UNIT_COST, true);
+				//TODO: clan lvl9 or more can reinforce knights cheaper if first knight unit already created, use Config.KNIGHT_REINFORCE_COST
 			}
+			
+			if (Config.DEBUG)
+				_log.fine("New sub_clan saved in db: " + getClanId() + "; " + pledgeType);
+		}
+		catch (Exception e)
+		{
+			_log.log(Level.SEVERE, "Error saving sub clan data: " + e.getMessage(), e);
+		}
+		finally
+		{
+			L2DatabaseFactory.close(con);
 		}
 		broadcastToOnlineMembers(new PledgeShowInfoUpdate(_leader.getClan()));
 		broadcastToOnlineMembers(new PledgeReceiveSubPledgeCreated(subPledge, _leader.getClan()));
@@ -1857,8 +1855,7 @@ public class L2Clan
 	{
 		if (_privs.get(rank) != null)
 			return _privs.get(rank).getPrivs();
-		else
-			return CP_NOTHING;
+		return CP_NOTHING;
 	}
 	
 	public void setRankPrivs(int rank, int privs)

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

@@ -24,7 +24,6 @@ import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.instancemanager.SiegeManager;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * Clan member class.
  */
@@ -308,26 +307,30 @@ public class L2ClanMember
 	
 	public int getRaceOrdinal()
 	{
-		if (_player != null) return _player.getRace().ordinal();
-		else return _raceOrdinal;
+		if (_player != null)
+			return _player.getRace().ordinal();
+		return _raceOrdinal;
 	}
 	
 	public boolean getSex()
 	{
-		if (_player != null) return _player.getAppearance().getSex();
-		else return _sex;
+		if (_player != null)
+			return _player.getAppearance().getSex();
+		return _sex;
 	}
 	
 	public int getSponsor()
 	{
-		if (_player != null) return _player.getSponsor();
-		else return _sponsor;
+		if (_player != null)
+			return _player.getSponsor();
+		return _sponsor;
 	}
 	
 	public int getApprentice()
 	{
-		if (_player != null) return _player.getApprentice();
-		else return _apprentice;
+		if (_player != null)
+			return _player.getApprentice();
+		return _apprentice;
 	}
 	
 	public String getApprenticeOrSponsorName()
@@ -341,14 +344,16 @@ public class L2ClanMember
 		if(_apprentice != 0)
 		{
 			L2ClanMember apprentice = _clan.getClanMember(_apprentice);
-			if(apprentice != null) return apprentice.getName();
-			else return "Error";
+			if(apprentice != null)
+				return apprentice.getName();
+			return "Error";
 		}
 		if(_sponsor != 0)
 		{
 			L2ClanMember sponsor = _clan.getClanMember(_sponsor);
-			if(sponsor != null) return sponsor.getName();
-			else return "Error";
+			if(sponsor != null) 
+				return sponsor.getName();
+			return "Error";
 		}
 		return "";
 	}

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

@@ -20,7 +20,6 @@ import com.l2jserver.Config;
 import com.l2jserver.util.Rnd;
 
 /**
- *
  * @author  Fulminus
  */
 public class L2DropCategory
@@ -105,16 +104,14 @@ public class L2DropCategory
 	{
 		if (getCategoryType() >= 0)
 			return _categoryChance;
-		else
-			return L2DropData.MAX_CHANCE;
+		return L2DropData.MAX_CHANCE;
 	}
 	
 	public int getCategoryBalancedChance()
 	{
 		if (getCategoryType() >= 0)
 			return _categoryBalancedChance;
-		else
-			return L2DropData.MAX_CHANCE;
+		return L2DropData.MAX_CHANCE;
 	}
 	
 	public int getCategoryType()

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

@@ -34,7 +34,6 @@ import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
  * Service class for manor
  * @author l3x
  */
-
 public class L2Manor
 {
 	private static Logger _log = Logger.getLogger(L2Manor.class.getName());
@@ -74,16 +73,12 @@ public class L2Manor
 	
 	public int getSeedBasicPrice(int seedId)
 	{
-		L2Item seedItem = ItemTable.getInstance().getTemplate(seedId);
-		
+		final L2Item seedItem = ItemTable.getInstance().getTemplate(seedId);
 		if (seedItem != null)
 		{
 			return seedItem.getReferencePrice();
 		}
-		else
-		{
-			return 0;
-		}
+		return 0;
 	}
 	
 	public int getSeedBasicPriceByCrop(int cropId)
@@ -98,12 +93,10 @@ public class L2Manor
 	
 	public int getCropBasicPrice(int cropId)
 	{
-		L2Item cropItem = ItemTable.getInstance().getTemplate(cropId);
-		
+		final L2Item cropItem = ItemTable.getInstance().getTemplate(cropId);
 		if (cropItem != null)
 			return cropItem.getReferencePrice();
-		else
-			return 0;
+		return 0;
 	}
 	
 	public int getMatureCrop(int cropId)

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

@@ -145,8 +145,7 @@ public class L2MapRegion
 	{
 		if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 			return _spawnLocs.get(Rnd.get(_spawnLocs.size()));
-		else
-			return _spawnLocs.get(0);
+		return _spawnLocs.get(0);
 	}
 	
 	public final Location getOtherSpawnLoc()
@@ -155,11 +154,9 @@ public class L2MapRegion
 		{
 			if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 				return _otherSpawnLocs.get(Rnd.get(_otherSpawnLocs.size()));
-			else
-				return _otherSpawnLocs.get(0);
+			return _otherSpawnLocs.get(0);
 		}
-		else
-			return getSpawnLoc();
+		return getSpawnLoc();
 	}
 	
 	public final Location getChaoticSpawnLoc()
@@ -168,11 +165,9 @@ public class L2MapRegion
 		{
 			if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 				return _chaoticSpawnLocs.get(Rnd.get(_chaoticSpawnLocs.size()));
-			else
-				return _chaoticSpawnLocs.get(0);
+			return _chaoticSpawnLocs.get(0);
 		}
-		else
-			return getSpawnLoc();
+		return getSpawnLoc();
 	}
 	
 	public final Location getBanishSpawnLoc()
@@ -181,11 +176,9 @@ public class L2MapRegion
 		{
 			if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 				return _banishSpawnLocs.get(Rnd.get(_banishSpawnLocs.size()));
-			else
-				return _banishSpawnLocs.get(0);
+			return _banishSpawnLocs.get(0);
 		}
-		else
-			return getSpawnLoc();
+		return getSpawnLoc();
 	}
 	
 	public final void addBannedRace(String race, String point)

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

@@ -15,6 +15,7 @@
 package com.l2jserver.gameserver.model;
 
 import com.l2jserver.util.Rnd;
+
 /**
  * This class defines the spawn data of a Minion type
  * In a group mob, there are one master called RaidBoss and several slaves called Minions.
@@ -22,7 +23,6 @@ import com.l2jserver.util.Rnd;
  * <B><U> Data</U> :</B><BR><BR>
  * <li>_minionId : The Identifier of the L2Minion to spawn </li>
  * <li>_minionAmount :  The number of this Minion Type to spawn </li><BR><BR>
- *
  */
 public class L2MinionData
 {
@@ -98,10 +98,7 @@ public class L2MinionData
 			_minionAmount = Rnd.get(_minionAmountMin, _minionAmountMax);
 			return _minionAmount;
 		}
-		else
-		{
-			return _minionAmountMin;
-		}
+		return _minionAmountMin;
 	}
 	
 }

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

@@ -169,8 +169,9 @@ public class L2Party
 			if (member.getInventory().validateCapacityByItemId(ItemId) &&
 					Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true)) availableMembers.add(member);
 		}
-		if (!availableMembers.isEmpty()) return availableMembers.get(Rnd.get(availableMembers.size()));
-		else return null;
+		if (!availableMembers.isEmpty())
+			return availableMembers.get(Rnd.get(availableMembers.size()));
+		return null;
 	}
 	
 	/**
@@ -769,11 +770,10 @@ public class L2Party
 				{
 					if (((L2PetInstance)member).getPetLevelData().getOwnerExpTaken() > 0)
 						continue;
-					else // TODO: This is a temporary fix while correct pet xp in party is figured out
-						penalty = (float)0.85;
+					// TODO: This is a temporary fix while correct pet xp in party is figured out
+					penalty = (float) 0.85;
 				}
 				
-				
 				// Calculate and add the EXP and SP reward to the member
 				if (validMembers.contains(member))
 				{
@@ -903,10 +903,7 @@ public class L2Party
 			//not is a valid party
 			return getBaseExpSpBonus(membersCount);
 		}
-		else
-		{
-			return getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_XP;
-		}
+		return getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_XP;
 	}
 	
 	private double getSpBonus(int membersCount)
@@ -916,10 +913,7 @@ public class L2Party
 			//not is a valid party
 			return getBaseExpSpBonus(membersCount);
 		}
-		else
-		{
-			return getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_SP;
-		}
+		return getBaseExpSpBonus(membersCount) * Config.RATE_PARTY_SP;
 	}
 	
 	public int getLevel() { return _partyLvl; }

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

@@ -1284,18 +1284,15 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	
 	public final boolean getWeaponDependancy(L2Character activeChar)
 	{
-		if(getWeaponDependancy(activeChar,false))
+		if(getWeaponDependancy(activeChar, false))
 		{
 			return true;
 		}
-		else
-		{
-			SystemMessage message = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
-			message.addSkillName(this);
-			activeChar.sendPacket(message);
-			
-			return false;
-		}
+		
+		final SystemMessage message = SystemMessage.getSystemMessage(SystemMessageId.S1_CANNOT_BE_USED);
+		message.addSkillName(this);
+		activeChar.sendPacket(message);
+		return false;
 	}
 	
 	public final boolean getWeaponDependancy(L2Character activeChar,boolean chance)
@@ -1725,14 +1722,12 @@ public abstract class L2Skill implements IChanceSkillTrigger
 						// If a target is found, return it in a table else send a system message TARGET_IS_INCORRECT
 						return new L2Character[]{target};
 					}
-					else
-						return _emptyTargetList;
 				}
 				else
 				{
 					activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
-					return _emptyTargetList;
 				}
+				return _emptyTargetList;
 			}
 			case TARGET_PARTY_OTHER:
 			{
@@ -1750,25 +1745,21 @@ public abstract class L2Skill implements IChanceSkillTrigger
 								case 426:
 									if (!((L2PcInstance)target).isMageClass())
 										return new L2Character[]{target};
-									else
-										return _emptyTargetList;
+									return _emptyTargetList;
 								case 427:
 									if (((L2PcInstance)target).isMageClass())
 										return new L2Character[]{target};
-									else
-										return _emptyTargetList;
+									return _emptyTargetList;
 							}
 						}
 						return new L2Character[]{target};
 					}
-					else
-						return _emptyTargetList;
 				}
 				else
 				{
 					activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
-					return _emptyTargetList;
 				}
+				return _emptyTargetList;
 			}
 			case TARGET_CORPSE_ALLY:
 			case TARGET_ALLY:
@@ -2105,8 +2096,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 								targetList.add(target);
 								return targetList.toArray(new L2Object[targetList.size()]);
 							}
-							else
-								return new L2Character[] {target};
+							return new L2Character[] { target };
 						}
 					}
 				}
@@ -2145,9 +2135,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 					targetList.add(target);
 					return targetList.toArray(new L2Object[targetList.size()]);
 				}
-				else
-					return new L2Character[] {target};
-				
+				return new L2Character[] { target };
 			}
 			case TARGET_AREA_CORPSE_MOB:
 			{
@@ -2207,8 +2195,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 					targetList.add(target);
 					return targetList.toArray(new L2Object[targetList.size()]);
 				}
-				else return new L2Character[] {target};
-				
+				return new L2Character[] { target };
 			}
 			case TARGET_UNDEAD:
 			{
@@ -2217,21 +2204,22 @@ public abstract class L2Skill implements IChanceSkillTrigger
 					if (!target.isUndead() || target.isDead())
 					{
 						activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
-						return _emptyTargetList;
 					}
-					
-					if (!onlyFirst)
-						targetList.add(target);
 					else
-						return new L2Character[] {target};
-					
-					return targetList.toArray(new L2Object[targetList.size()]);
+					{
+						if (!onlyFirst)
+							targetList.add(target);
+						else
+							return new L2Character[] {target};
+						
+						return targetList.toArray(new L2Object[targetList.size()]);
+					}
 				}
 				else
 				{
 					activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
-					return _emptyTargetList;
 				}
+				return _emptyTargetList;
 			}
 			case TARGET_AREA_UNDEAD:
 			{
@@ -2389,8 +2377,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		
 		if (targets.length == 0)
 			return null;
-		else
-			return targets[0];
+		return targets[0];
 	}
 	
 	/*

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

@@ -36,7 +36,6 @@ import com.l2jserver.gameserver.util.Util;
 
 /**
  * @author Advi
- *
  */
 public class TradeList
 {
@@ -295,8 +294,7 @@ public class TradeList
 				{
 					if (item.getCount() <= exclItem.getCount())
 						return null;
-					else
-						return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice());
+					return new TradeItem(item, item.getCount() - exclItem.getCount(), item.getReferencePrice());
 				}
 			}
 		}
@@ -932,8 +930,7 @@ public class TradeList
 		player.sendPacket(playerIU);
 		if (ok)
 			return 0;
-		else
-			return 2;
+		return 2;
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -1002,16 +1002,14 @@ public class L2Attackable extends L2Npc
 				((L2AttackableAI) getAI()).setGlobalAggro(-25);
 				return;
 			}
-			else
+			
+			for (L2Character aggroed : getAggroList().keySet())
 			{
-				for (L2Character aggroed : getAggroList().keySet())
-				{
-					AggroInfo ai = getAggroList().get(aggroed);
-					
-					if (ai == null)
-						return;
-					ai.addHate(-amount);
-				}
+				AggroInfo ai = getAggroList().get(aggroed);
+				
+				if (ai == null)
+					return;
+				ai.addHate(-amount);
 			}
 			
 			amount = getHating(mostHated);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2136,17 +2136,15 @@ public abstract class L2Character extends L2Object
 					sm.addItemName(skill.getItemConsumeId());
 					sm.addNumber(skill.getItemConsume());
 					sendPacket(sm);
-					return false;
 				}
 				else
 				{
 					// Send a System Message to the caster
 					sendPacket(SystemMessage.getSystemMessage(SystemMessageId.THERE_ARE_NOT_ENOUGH_NECESSARY_ITEMS_TO_USE_THE_SKILL));
-					return false;
 				}
+				return false;
 			}
 		}
-		
 		return true;
 	}
 	
@@ -4710,8 +4708,7 @@ public abstract class L2Character extends L2Object
 					{
 						if (gtx == _move.geoPathGtx && gty == _move.geoPathGty)
 							return;
-						else
-							_move.onGeodataPathIndex = -1; // Set not on geodata path
+						_move.onGeodataPathIndex = -1; // Set not on geodata path
 					}
 					catch (NullPointerException e)
 					{
@@ -4767,14 +4764,12 @@ public abstract class L2Character extends L2Object
 							getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
 							return;
 						}
-						else
-						{
-							m.disregardingGeodata = true;
-							x = originalX;
-							y = originalY;
-							z = originalZ;
-							distance = originalDistance;
-						}
+						
+						m.disregardingGeodata = true;
+						x = originalX;
+						y = originalY;
+						z = originalZ;
+						distance = originalDistance;
 					}
 					else
 					{
@@ -5101,21 +5096,22 @@ public abstract class L2Character extends L2Object
 		double dx = x - getX();
 		double dy = y - getY();
 		double dz = z - getZ();
-		
+		boolean isInsideRadius = false;
 		if (strictCheck)
 		{
 			if (checkZ)
-				return (dx * dx + dy * dy + dz * dz) < radius * radius;
+				isInsideRadius = (dx * dx + dy * dy + dz * dz) < radius * radius;
 			else
-				return (dx * dx + dy * dy) < radius * radius;
+				isInsideRadius = (dx * dx + dy * dy) < radius * radius;
 		}
 		else
 		{
 			if (checkZ)
-				return (dx * dx + dy * dy + dz * dz) <= radius * radius;
+				isInsideRadius = (dx * dx + dy * dy + dz * dz) <= radius * radius;
 			else
-				return (dx * dx + dy * dy) <= radius * radius;
+				isInsideRadius = (dx * dx + dy * dy) <= radius * radius;
 		}
+		return isInsideRadius;
 	}
 	
 	//	/**
@@ -6446,12 +6442,10 @@ public abstract class L2Character extends L2Object
 			setIsCastingSimultaneouslyNow(false);
 			return;
 		}
-		else
-		{
-			_skillCast = null;
-			setIsCastingNow(false);
-			_castInterruptTime = 0;
-		}
+		
+		_skillCast = null;
+		setIsCastingNow(false);
+		_castInterruptTime = 0;
 		
 		final L2Skill skill = mut.skill;
 		final L2Object target = mut.targets.length > 0 ? mut.targets[0] : null;
@@ -6932,8 +6926,7 @@ public abstract class L2Character extends L2Object
 		L2Object target = getTarget();
 		if (target instanceof L2Character)
 			return isInFrontOf((L2Character) target);
-		else
-			return false;
+		return false;
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -190,29 +190,26 @@ public class L2Npc extends L2Character
 	
 	public boolean useSpiritShot()
 	{
-		
 		if (_spiritshotcharged)
 			return true;
-		else
+		
+		//_spiritshotcharged = false;
+		if (_spsrecharged)
 		{
-			//_spiritshotcharged = false;
-			if (_spsrecharged)
-			{
-				_spiritshotamount = getSpiritShot();
-				_spsrecharged = false;
-			}
-			else if (_spiritshotamount > 0)
+			_spiritshotamount = getSpiritShot();
+			_spsrecharged = false;
+		}
+		else if (_spiritshotamount > 0)
+		{
+			if (Rnd.get(100) <= getSpiritShotChance())
 			{
-				if (Rnd.get(100) <= getSpiritShotChance())
-				{
-					_spiritshotamount = _spiritshotamount - 1;
-					Broadcast.toSelfAndKnownPlayersInRadius(this, new MagicSkillUse(this, this, 2061, 1, 0, 0), 360000);
-					_spiritshotcharged = true;
-				}
+				_spiritshotamount = _spiritshotamount - 1;
+				Broadcast.toSelfAndKnownPlayersInRadius(this, new MagicSkillUse(this, this, 2061, 1, 0, 0), 360000);
+				_spiritshotcharged = true;
 			}
-			else
-				return false;
 		}
+		else
+			return false;
 		
 		return _spiritshotcharged;
 	}
@@ -302,8 +299,7 @@ public class L2Npc extends L2Character
 		
 		if (AI.getLongRangeSkill() == 0)
 			return false;
-		else
-			return true;
+		return true;
 	}
 	
 	public boolean hasSSkill()
@@ -312,9 +308,7 @@ public class L2Npc extends L2Character
 		
 		if (AI.getShortRangeSkill() == 0)
 			return false;
-		else
-			return true;
-		
+		return true;
 	}
 	
 	public FastList<L2Skill> getLrangeSkill()
@@ -1638,13 +1632,11 @@ public class L2Npc extends L2Character
 			player.sendPacket(msg);
 			return;
 		}
-		else
-		{
-			NpcHtmlMessage noTeachMsg = new NpcHtmlMessage(getObjectId());
-			noTeachMsg.setHtml(html);
-			noTeachMsg.replace("%objectId%", String.valueOf(getObjectId()));
-			player.sendPacket(noTeachMsg);
-		}
+		
+		final NpcHtmlMessage noTeachMsg = new NpcHtmlMessage(getObjectId());
+		noTeachMsg.setHtml(html);
+		noTeachMsg.replace("%objectId%", String.valueOf(getObjectId()));
+		player.sendPacket(noTeachMsg);
 	}
 	
 	public L2Npc scheduleDespawn(long delay)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -282,16 +282,16 @@ public abstract class L2Summon extends L2Playable
 	{
 		if (getTemplate().getAIDataStatic().getSoulShot() > 0)
 			return (short) getTemplate().getAIDataStatic().getSoulShot();
-		else
-			return 1;
+		
+		return 1;
 	}
 	
 	public short getSpiritShotsPerHit()
 	{
 		if (getTemplate().getAIDataStatic().getSpiritShot() > 0)
 			return (short) getTemplate().getAIDataStatic().getSpiritShot();
-		else
-			return 1;
+		
+		return 1;
 	}
 	
 	public void setChargedSoulShot(int shotType)
@@ -544,8 +544,8 @@ public abstract class L2Summon extends L2Playable
 	{
 		if (_owner == null)
 			return null;
-		else
-			return _owner.getParty();
+		
+		return _owner.getParty();
 	}
 	
 	/**
@@ -556,8 +556,7 @@ public abstract class L2Summon extends L2Playable
 	{
 		if (_owner == null)
 			return false;
-		else
-			return _owner.getParty() != null;
+		return _owner.getParty() != null;
 	}
 	
 	/**

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

@@ -343,8 +343,7 @@ public final class L2AuctioneerInstance extends L2Npc
 				{
 					if (player.getClan().getAuctionBiddedAt() <= 0)
 						return;
-					else
-						auctionId = player.getClan().getAuctionBiddedAt();
+					auctionId = player.getClan().getAuctionBiddedAt();
 				}
 				else
 					auctionId = Integer.parseInt(val);
@@ -631,8 +630,7 @@ public final class L2AuctioneerInstance extends L2Npc
 		{
 			if (getCastle().getSiege().getIsInProgress())
 				return COND_BUSY_BECAUSE_OF_SIEGE; // Busy because of siege
-			else
-				return COND_REGULAR;
+			return COND_REGULAR;
 		}
 		
 		return COND_ALL_FALSE;

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

@@ -20,7 +20,7 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
 /**
- * @author  l3x
+ * @author l3x
  */
 public class L2CastleBlacksmithInstance extends L2NpcInstance
 {
@@ -66,8 +66,7 @@ public class L2CastleBlacksmithInstance extends L2NpcInstance
 				showChatWindow(player, val);
 				return;
 			}
-			else
-				super.onBypassFeedback(player, command);
+			super.onBypassFeedback(player, command);
 		}
 	}
 	

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

@@ -114,30 +114,28 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 				if ((player.getClanPrivileges() & L2Clan.CP_CS_MANAGE_SIEGE) == L2Clan.CP_CS_MANAGE_SIEGE)
 				{
 					getCastle().getSiege().listRegisterClan(player); // List current register clan
-					return;
 				}
 				else
 				{
 					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("list_territory_clans"))
 			{
 				if ((player.getClanPrivileges() & L2Clan.CP_CS_MANAGE_SIEGE) == L2Clan.CP_CS_MANAGE_SIEGE)
 				{
 					player.sendPacket(new ExShowDominionRegistry(getCastle().getCastleId(), player));
-					return;
 				}
 				else
 				{
 					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("receive_report"))
 			{
@@ -207,15 +205,14 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 							break;
 					}
 					player.sendPacket(html);
-					return;
 				}
 				else
 				{
 					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("items"))
 			{
@@ -230,30 +227,28 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 					
 					showBuyWindow(player,Integer.parseInt(val + "1"));
 					player.sendPacket(ActionFailed.STATIC_PACKET);
-					return;
 				}
 				else
 				{
 					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("manage_siege_defender"))
 			{
 				if ((player.getClanPrivileges() & L2Clan.CP_CS_MANAGE_SIEGE) == L2Clan.CP_CS_MANAGE_SIEGE)
 				{
 					getCastle().getSiege().listRegisterClan(player);
-					return;
 				}
 				else
 				{
 					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("manage_vault"))
 			{
@@ -305,15 +300,14 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 					html.replace("%tax_income%", Util.formatAdena(getCastle().getTreasury()));
 					html.replace("%withdraw_amount%", Util.formatAdena(amount));
 					player.sendPacket(html);
-					return;
 				}
 				else
 				{
 					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("operate_door")) // door
 				// control
@@ -343,15 +337,14 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					html.replace("%npcname%", getName());
 					player.sendPacket(html);
-					return;
 				}
 				else
 				{
 					NpcHtmlMessage html = new NpcHtmlMessage(getObjectId());
 					html.setFile(player.getHtmlPrefix(), "data/html/chamberlain/chamberlain-noprivs.htm");
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("tax_set")) // tax rates
 				// control
@@ -379,7 +372,6 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 							"</body></html>"
 					);
 					sendHtmlMessage(player, msg);
-					return;
 				}
 				else
 				{
@@ -388,8 +380,8 @@ public class L2CastleChamberlainInstance extends L2MerchantInstance
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					html.replace("%tax%", String.valueOf(getCastle().getTaxPercent()));
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("manage_functions"))
 			{

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

@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
 /**
  * @author Kerberos
- *
  */
 public final class L2CastleTeleporterInstance extends L2Npc
 {
@@ -40,6 +39,7 @@ public final class L2CastleTeleporterInstance extends L2Npc
 	private boolean _currentTask = false;
 	
 	/**
+	 * @param objectId
 	 * @param template
 	 */
 	public L2CastleTeleporterInstance(int objectId, L2NpcTemplate template)
@@ -74,8 +74,7 @@ public final class L2CastleTeleporterInstance extends L2Npc
 			player.sendPacket(html);
 			return;
 		}
-		else
-			super.onBypassFeedback(player, command);
+		super.onBypassFeedback(player, command);
 	}
 	
 	@Override

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

@@ -1370,8 +1370,7 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 		{
 			if (getClanHall().getOwnerId() == player.getClanId())
 				return COND_OWNER;
-			else
-				return COND_OWNER_FALSE;
+			return COND_OWNER_FALSE;
 		}
 		return COND_ALL_FALSE;
 	}

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

@@ -416,8 +416,7 @@ public class L2DoorInstance extends L2Character
 		{
 			if (TerritoryWarManager.getInstance().isAllyField(actingPlayer, activeSiegeId))
 				return false;
-			else
-				return true;
+			return true;
 		}
 		else if (isFort)
 		{

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

@@ -75,7 +75,6 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				html.replace("%bloodoath%", String.valueOf(blood));
 				player.sendPacket(html);
-				return;
 			}
 			else
 			{
@@ -83,8 +82,8 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				player.sendPacket(html);
-				return;
 			}
+			return;
 		}
 		else if (actualCommand.equalsIgnoreCase("blood"))
 		{
@@ -103,7 +102,6 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noblood.htm");
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				player.sendPacket(html);
-				return;
 			}
 			else
 			{
@@ -111,8 +109,8 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				player.sendPacket(html);
-				return;
 			}
+			return;
 		}
 		else if (actualCommand.equalsIgnoreCase("supplylvl"))
 		{
@@ -128,7 +126,6 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				player.sendPacket(html);
-				return;
 			}
 			else
 			{
@@ -136,8 +133,8 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-1.htm");
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				player.sendPacket(html);
-				return;
 			}
+			return;
 		}
 		else if (actualCommand.equalsIgnoreCase("supply"))
 		{
@@ -169,7 +166,6 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 				}
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				player.sendPacket(html);
-				return;
 			}
 			else
 			{
@@ -177,11 +173,10 @@ public class L2FortLogisticsInstance extends L2MerchantInstance
 				html.setFile(player.getHtmlPrefix(), "data/html/fortress/logistics-noprivs.htm");
 				html.replace("%objectId%", String.valueOf(getObjectId()));
 				player.sendPacket(html);
-				return;
 			}
+			return;
 		}
-		else
-			super.onBypassFeedback(player, command);
+		super.onBypassFeedback(player, command);
 	}
 	
 	@Override

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

@@ -94,7 +94,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-expel.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
-					return;
 				}
 				else
 				{
@@ -102,8 +101,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("banish_foreigner"))
 			{
@@ -114,7 +113,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-expeled.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
-					return;
 				}
 				else
 				{
@@ -122,8 +120,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("receive_report"))
 			{
@@ -147,7 +145,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						html.replace("%min%", String.valueOf(minutes));
 					}
 					player.sendPacket(html);
-					return;
 				}
 				else
 				{
@@ -175,8 +172,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					html.replace("%hr2%", String.valueOf(hour));
 					html.replace("%min2%", String.valueOf(minutes));
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if (actualCommand.equalsIgnoreCase("operate_door")) // door
 				// control
@@ -194,7 +191,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
 							html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-opened.htm");
 							html.replace("%objectId%", String.valueOf(getObjectId()));
 							player.sendPacket(html);
-							return;
 						}
 						else
 						{
@@ -202,7 +198,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
 							html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-closed.htm");
 							html.replace("%objectId%", String.valueOf(getObjectId()));
 							player.sendPacket(html);
-							return;
 						}
 					}
 					else
@@ -212,7 +207,6 @@ public class L2FortManagerInstance extends L2MerchantInstance
 						html.replace("%objectId%", String.valueOf(getObjectId()));
 						html.replace("%npcname%", getName());
 						player.sendPacket(html);
-						return;
 					}
 				}
 				else
@@ -221,8 +215,8 @@ public class L2FortManagerInstance extends L2MerchantInstance
 					html.setFile(player.getHtmlPrefix(), "data/html/fortress/foreman-noprivs.htm");
 					html.replace("%objectId%", String.valueOf(getObjectId()));
 					player.sendPacket(html);
-					return;
 				}
+				return;
 			}
 			else if(actualCommand.equalsIgnoreCase("manage_vault"))
 			{

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

@@ -4448,8 +4448,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (_clan == null)
 			return 0;
-		else
-			return _clan.getAllyId();
+		return _clan.getAllyId();
 	}
 	
 	public int getAllyCrestId()
@@ -6327,10 +6326,7 @@ public final class L2PcInstance extends L2Playable
 		{
 			return false;
 		}
-		else
-		{
-			return getObjectId() == getClan().getLeaderId();
-		}
+		return getObjectId() == getClan().getLeaderId();
 	}
 	
 	/**
@@ -7836,8 +7832,7 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (_isOnline && getClient() != null)
 			return getClient().isDetached() ? 2 : 1;
-		else
-			return 0;
+		return 0;
 	}
 	
 	public boolean isIn7sDungeon()
@@ -7879,16 +7874,14 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (store)
 			return removeSkill(skill);
-		else
-			return super.removeSkill(skill, true);
+		return super.removeSkill(skill, true);
 	}
 	
 	public L2Skill removeSkill(L2Skill skill, boolean store, boolean cancelEffect)
 	{
 		if (store)
 			return removeSkill(skill);
-		else
-			return super.removeSkill(skill, cancelEffect);
+		return super.removeSkill(skill, cancelEffect);
 	}
 	
 	/**
@@ -8467,8 +8460,7 @@ public final class L2PcInstance extends L2Playable
 		if (attacker instanceof L2PcInstance && ((L2PcInstance)attacker).isInOlympiadMode() ){
 			if (isInOlympiadMode() && isOlympiadStart() && ((L2PcInstance)attacker).getOlympiadGameId()==getOlympiadGameId())
 				return true;
-			else
-				return false;
+			return false;
 		}
 		
 		// Check if the attacker is in TvT and TvT is started
@@ -9114,9 +9106,7 @@ public final class L2PcInstance extends L2Playable
 		
 		if (castle != null)
 			return checkIfOkToUseStriderSiegeAssault(castle);
-		else
-			return checkIfOkToUseStriderSiegeAssault(fort);
-		
+		return checkIfOkToUseStriderSiegeAssault(fort);
 	}
 	
 	public boolean checkIfOkToUseStriderSiegeAssault(Castle castle)
@@ -9726,7 +9716,7 @@ public final class L2PcInstance extends L2Playable
 			sendPacket(sm);
 			return true;
 		}
-		else return false;
+		return false;
 	}
 	
 	/**
@@ -13580,8 +13570,7 @@ public final class L2PcInstance extends L2Playable
 		// if pet is attacking
 		if (isAttackingNow())
 			return getPetLevelData(_mountNpcId).getPetFeedBattle();
-		else
-			return getPetLevelData(_mountNpcId).getPetFeedNormal();
+		return getPetLevelData(_mountNpcId).getPetFeedNormal();
 	}
 	
 	public void setCurrentFeed(int num)
@@ -13744,12 +13733,10 @@ public final class L2PcInstance extends L2Playable
 			sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FORCE_MAXLEVEL_REACHED));
 			return;
 		}
-		else
-		{
-			// if no charges - start clear task
-			if (_charges.get() == 0)
-				restartChargeTask();
-		}
+		
+		// if no charges - start clear task
+		if (_charges.get() == 0)
+			restartChargeTask();
 		
 		if (_charges.addAndGet(count) >= max)
 		{
@@ -14309,17 +14296,15 @@ public final class L2PcInstance extends L2Playable
 		{
 			return 0;
 		}
-		else
+		
+		int i;
+		for (i = 1; i < 6; i++)
 		{
-			int i;
-			for (i = 1; i < 6; i++)
-			{
-				now.add(Calendar.HOUR_OF_DAY, 24);
-				if (now.get(Calendar.MONTH) == birth.get(Calendar.MONTH)
-						&& now.get(Calendar.DAY_OF_MONTH) == birth.get(Calendar.DAY_OF_MONTH)
-						&& now.get(Calendar.YEAR) != birth.get(Calendar.YEAR))
-					return i;
-			}
+			now.add(Calendar.HOUR_OF_DAY, 24);
+			if (now.get(Calendar.MONTH) == birth.get(Calendar.MONTH)
+					&& now.get(Calendar.DAY_OF_MONTH) == birth.get(Calendar.DAY_OF_MONTH)
+					&& now.get(Calendar.YEAR) != birth.get(Calendar.YEAR))
+				return i;
 		}
 		return -1;
 	}
@@ -14481,16 +14466,14 @@ public final class L2PcInstance extends L2Playable
 	{
 		if (getAppearance().getSex())
 			return getBaseTemplate().fCollisionRadius_female;
-		else
-			return getBaseTemplate().fCollisionRadius;
+		return getBaseTemplate().fCollisionRadius;
 	}
 	
 	public double getCollisionHeight()
 	{
 		if (getAppearance().getSex())
 			return getBaseTemplate().fCollisionHeight_female;
-		else
-			return getBaseTemplate().fCollisionHeight;
+		return getBaseTemplate().fCollisionHeight;
 	}
 	
 	public final int getClientX()
@@ -14704,12 +14687,9 @@ public final class L2PcInstance extends L2Playable
 			{
 				continue;
 			}
-			else
-			{
-				// player level is too low for such skill level
-				if (getLevel() < (learn.getGetLevel() - 9))
-					deacreaseSkillLevel(id);
-			}
+			// player level is too low for such skill level
+			if (getLevel() < (learn.getGetLevel() - 9))
+				deacreaseSkillLevel(id);
 		}
 	}
 	
@@ -14750,8 +14730,7 @@ public final class L2PcInstance extends L2Playable
 		{
 			return true;
 		}
-		else
-			return false;
+		return false;
 	}
 	
 	public void setMultiSocialAction(int id, int targetId)

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

@@ -37,8 +37,7 @@ public class L2PenaltyMonsterInstance extends L2MonsterInstance
 	{
 		if (_ptk != null)
 			return _ptk; //always attack only one person
-		else
-			return super.getMostHated();
+		return super.getMostHated();
 	}
 	
 	public void setPlayerToKill(L2PcInstance ptk)

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

@@ -70,7 +70,6 @@ import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
-
 /**
  *
  * This class ...
@@ -238,8 +237,7 @@ public class L2PetInstance extends L2Summon
 			// if pet is attacking
 			if (isAttackingNow())
 				return getPetLevelData().getPetFeedBattle();
-			else
-				return getPetLevelData().getPetFeedNormal();
+			return getPetLevelData().getPetFeedNormal();
 		}
 	}
 	

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

@@ -77,14 +77,12 @@ public class L2SiegeFlagInstance extends L2Npc
 		{
 			throw new NullPointerException(getClass().getSimpleName()+": Initialization failed.");
 		}
-		else
-		{
-			L2SiegeClan sc = _siege.getAttackerClan(_clan);
-			if (sc == null)
-				throw new NullPointerException(getClass().getSimpleName()+": Cannot find siege clan.");
-			else
-				sc.addFlag(this);
-		}
+		
+		L2SiegeClan sc = _siege.getAttackerClan(_clan);
+		if (sc == null)
+			throw new NullPointerException(getClass().getSimpleName()+": Cannot find siege clan.");
+		
+		sc.addFlag(this);
 		_isAdvanced = advanced;
 		getStatus();
 		setIsInvul(false);

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

@@ -176,13 +176,12 @@ public class L2SignsPriestInstance extends L2Npc
 					if (fee)
 					{
 						showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_33_dawn_no.htm");
-						break;
 					}
 					else
 					{
 						showChatWindow(player, SevenSigns.SEVEN_SIGNS_HTML_PATH + "signs_33_dawn.htm");
-						break;
 					}
+					break;
 				case 3: // Join Cabal Intro 1
 				case 8: // Festival of Darkness Intro - SevenSigns x [0]1
 					showChatWindow(player, val, SevenSigns.getCabalShortName(cabal), false);
@@ -386,7 +385,6 @@ public class L2SignsPriestInstance extends L2Npc
 					if (contribScore == Config.ALT_MAXIMUM_PLAYER_CONTRIB)
 					{
 						player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CONTRIB_SCORE_EXCEEDED));
-						break;
 					}
 					else
 					{

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

@@ -27,11 +27,11 @@ import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 
+/**
+ * @author evill33t & squeezed
+ */
 public class L2WeddingManagerInstance extends L2Npc
 {
-	/**
-	 * @author evill33t & squeezed
-	 */
 	public L2WeddingManagerInstance(int objectId, L2NpcTemplate template)
 	{
 		super(objectId, template);
@@ -66,156 +66,151 @@ public class L2WeddingManagerInstance extends L2Npc
 			sendHtmlMessage(player, filename, replace);
 			return;
 		}
-		else
+		
+		final L2PcInstance ptarget = L2World.getInstance().getPlayer(player.getPartnerId());
+		// Is partner online?
+		if (ptarget == null || !ptarget.isOnline())
+		{
+			filename = "data/html/mods/Wedding_notfound.htm";
+			sendHtmlMessage(player, filename, replace);
+			return;
+		}
+		
+		// Is already married?
+		if (player.isMarried())
+		{
+			filename = "data/html/mods/Wedding_already.htm";
+			sendHtmlMessage(player, filename, replace);
+			return;
+		}
+		else if (player.isMarryAccepted())
+		{
+			filename = "data/html/mods/Wedding_waitforpartner.htm";
+			sendHtmlMessage(player, filename, replace);
+			return;
+		}
+		else if (command.startsWith("AcceptWedding"))
+		{
+			// Check for Formal Wear
+			if (!wearsFormalWear(player, ptarget))
+			{
+				filename = "data/html/mods/Wedding_noformal.htm";
+				sendHtmlMessage(ptarget, filename, replace);
+				sendHtmlMessage(player, filename, replace);
+				return;
+			}
+			
+			// Check and reduce wedding price
+			if (player.getAdena() < Config.L2JMOD_WEDDING_PRICE || ptarget.getAdena() < Config.L2JMOD_WEDDING_PRICE)
+			{
+				filename = "data/html/mods/Wedding_adena.htm";
+				replace = String.valueOf(Config.L2JMOD_WEDDING_PRICE);
+				sendHtmlMessage(ptarget, filename, replace);
+				sendHtmlMessage(player, filename, replace);
+				return;
+			}
+			player.reduceAdena("Wedding", Config.L2JMOD_WEDDING_PRICE, player.getLastFolkNPC(), true);
+			ptarget.reduceAdena("Wedding", Config.L2JMOD_WEDDING_PRICE, player.getLastFolkNPC(), true);
+			
+			// Accept the wedding request
+			player.setMarryAccepted(true);
+			Couple couple = CoupleManager.getInstance().getCouple(player.getCoupleId());
+			couple.marry();
+			
+			// Messages to the couple
+			player.sendMessage("Congratulations you are married!");
+			player.setMarried(true);
+			player.setMarryRequest(false);
+			ptarget.sendMessage("Congratulations you are married!");
+			ptarget.setMarried(true);
+			ptarget.setMarryRequest(false);
+			
+			// Wedding march
+			MagicSkillUse MSU = new MagicSkillUse(player, player, 2230, 1, 1, 0);
+			player.broadcastPacket(MSU);
+			MSU = new MagicSkillUse(ptarget, ptarget, 2230, 1, 1, 0);
+			ptarget.broadcastPacket(MSU);
+			
+			// Fireworks
+			L2Skill skill = SkillTable.FrequentSkill.LARGE_FIREWORK.getSkill();
+			if (skill != null)
+			{
+				MSU = new MagicSkillUse(player, player, 2025, 1, 1, 0);
+				player.sendPacket(MSU);
+				player.broadcastPacket(MSU);
+				player.useMagic(skill, false, false);
+				
+				MSU = new MagicSkillUse(ptarget, ptarget, 2025, 1, 1, 0);
+				ptarget.sendPacket(MSU);
+				ptarget.broadcastPacket(MSU);
+				ptarget.useMagic(skill, false, false);
+				
+			}
+			
+			Announcements.getInstance().announceToAll("Congratulations to " + player.getName() + " and " + ptarget.getName() + "! They have been married.");
+			
+			filename = "data/html/mods/Wedding_accepted.htm";
+			sendHtmlMessage(ptarget, filename, replace);
+			sendHtmlMessage(player, filename, replace);
+			
+			return;
+		}
+		else if (command.startsWith("DeclineWedding"))
 		{
-			L2PcInstance ptarget = L2World.getInstance().getPlayer(player.getPartnerId());
+			player.setMarryRequest(false);
+			ptarget.setMarryRequest(false);
+			player.setMarryAccepted(false);
+			ptarget.setMarryAccepted(false);
 			
-			// Is partner online?
-			if (ptarget == null || !ptarget.isOnline())
+			player.sendMessage("You declined your partner's marriage request.");
+			ptarget.sendMessage("Your partner declined your marriage request.");
+			
+			filename = "data/html/mods/Wedding_declined.htm";
+			sendHtmlMessage(ptarget, filename, replace);
+			sendHtmlMessage(player, filename, replace);
+			
+			return;
+		}
+		else if (player.isMarryRequest())
+		{
+			// Check for Formal Wear
+			if (!wearsFormalWear(player, ptarget))
 			{
-				filename = "data/html/mods/Wedding_notfound.htm";
+				filename = "data/html/mods/Wedding_noformal.htm";
+				sendHtmlMessage(ptarget, filename, replace);
 				sendHtmlMessage(player, filename, replace);
 				return;
 			}
-			else
+			filename = "data/html/mods/Wedding_ask.htm";
+			player.setMarryRequest(false);
+			ptarget.setMarryRequest(false);
+			replace = ptarget.getName();
+			sendHtmlMessage(player, filename, replace);
+			return;
+		}
+		else if (command.startsWith("AskWedding"))
+		{
+			// Check for Formal Wear
+			if (!wearsFormalWear(player, ptarget))
 			{
-				// Is already married?
-				if (player.isMarried())
-				{
-					filename = "data/html/mods/Wedding_already.htm";
-					sendHtmlMessage(player, filename, replace);
-					return;
-				}
-				else if (player.isMarryAccepted())
-				{
-					filename = "data/html/mods/Wedding_waitforpartner.htm";
-					sendHtmlMessage(player, filename, replace);
-					return;
-				}
-				else if (command.startsWith("AcceptWedding"))
-				{
-					// Check for Formal Wear
-					if (!wearsFormalWear(player, ptarget))
-					{
-						filename = "data/html/mods/Wedding_noformal.htm";
-						sendHtmlMessage(ptarget, filename, replace);
-						sendHtmlMessage(player, filename, replace);
-						return;
-					}
-					
-					// Check and reduce wedding price
-					if (player.getAdena() < Config.L2JMOD_WEDDING_PRICE || ptarget.getAdena() < Config.L2JMOD_WEDDING_PRICE)
-					{
-						filename = "data/html/mods/Wedding_adena.htm";
-						replace = String.valueOf(Config.L2JMOD_WEDDING_PRICE);
-						sendHtmlMessage(ptarget, filename, replace);
-						sendHtmlMessage(player, filename, replace);
-						return;
-					}
-					player.reduceAdena("Wedding", Config.L2JMOD_WEDDING_PRICE, player.getLastFolkNPC(), true);
-					ptarget.reduceAdena("Wedding", Config.L2JMOD_WEDDING_PRICE, player.getLastFolkNPC(), true);
-					
-					// Accept the wedding request
-					player.setMarryAccepted(true);
-					Couple couple = CoupleManager.getInstance().getCouple(player.getCoupleId());
-					couple.marry();
-					
-					// Messages to the couple
-					player.sendMessage("Congratulations you are married!");
-					player.setMarried(true);
-					player.setMarryRequest(false);
-					ptarget.sendMessage("Congratulations you are married!");
-					ptarget.setMarried(true);
-					ptarget.setMarryRequest(false);
-					
-					// Wedding march
-					MagicSkillUse MSU = new MagicSkillUse(player, player, 2230, 1, 1, 0);
-					player.broadcastPacket(MSU);
-					MSU = new MagicSkillUse(ptarget, ptarget, 2230, 1, 1, 0);
-					ptarget.broadcastPacket(MSU);
-					
-					// Fireworks
-					L2Skill skill = SkillTable.FrequentSkill.LARGE_FIREWORK.getSkill();
-					if (skill != null)
-					{
-						MSU = new MagicSkillUse(player, player, 2025, 1, 1, 0);
-						player.sendPacket(MSU);
-						player.broadcastPacket(MSU);
-						player.useMagic(skill, false, false);
-						
-						MSU = new MagicSkillUse(ptarget, ptarget, 2025, 1, 1, 0);
-						ptarget.sendPacket(MSU);
-						ptarget.broadcastPacket(MSU);
-						ptarget.useMagic(skill, false, false);
-						
-					}
-					
-					Announcements.getInstance().announceToAll("Congratulations to " + player.getName() + " and " + ptarget.getName() + "! They have been married.");
-					
-					filename = "data/html/mods/Wedding_accepted.htm";
-					sendHtmlMessage(ptarget, filename, replace);
-					sendHtmlMessage(player, filename, replace);
-					
-					return;
-				}
-				else if (command.startsWith("DeclineWedding"))
-				{
-					player.setMarryRequest(false);
-					ptarget.setMarryRequest(false);
-					player.setMarryAccepted(false);
-					ptarget.setMarryAccepted(false);
-					
-					player.sendMessage("You declined your partner's marriage request.");
-					ptarget.sendMessage("Your partner declined your marriage request.");
-					
-					filename = "data/html/mods/Wedding_declined.htm";
-					sendHtmlMessage(ptarget, filename, replace);
-					sendHtmlMessage(player, filename, replace);
-					
-					return;
-				}
-				else if (player.isMarryRequest())
-				{
-					// Check for Formal Wear
-					if (!wearsFormalWear(player, ptarget))
-					{
-						filename = "data/html/mods/Wedding_noformal.htm";
-						sendHtmlMessage(ptarget, filename, replace);
-						sendHtmlMessage(player, filename, replace);
-						return;
-					}
-					filename = "data/html/mods/Wedding_ask.htm";
-					player.setMarryRequest(false);
-					ptarget.setMarryRequest(false);
-					replace = ptarget.getName();
-					sendHtmlMessage(player, filename, replace);
-					return;
-				}
-				else if (command.startsWith("AskWedding"))
-				{
-					// Check for Formal Wear
-					if (!wearsFormalWear(player, ptarget))
-					{
-						filename = "data/html/mods/Wedding_noformal.htm";
-						sendHtmlMessage(ptarget, filename, replace);
-						sendHtmlMessage(player, filename, replace);
-						return;
-					}
-					
-					player.setMarryAccepted(true);
-					ptarget.setMarryRequest(true);
-					
-					filename = "data/html/mods/Wedding_ask.htm";
-					replace = player.getName();
-					sendHtmlMessage(ptarget, filename, replace);
-					
-					filename = "data/html/mods/Wedding_requested.htm";
-					replace = ptarget.getName();
-					sendHtmlMessage(player, filename, replace);
-					
-					return;
-				}
+				filename = "data/html/mods/Wedding_noformal.htm";
+				sendHtmlMessage(ptarget, filename, replace);
+				sendHtmlMessage(player, filename, replace);
+				return;
 			}
+			
+			player.setMarryAccepted(true);
+			ptarget.setMarryRequest(true);
+			
+			filename = "data/html/mods/Wedding_ask.htm";
+			replace = player.getName();
+			sendHtmlMessage(ptarget, filename, replace);
+			
+			filename = "data/html/mods/Wedding_requested.htm";
+			replace = ptarget.getName();
+			sendHtmlMessage(player, filename, replace);
+			
+			return;
 		}
 		sendHtmlMessage(player, filename, replace);
 	}
@@ -237,10 +232,7 @@ public class L2WeddingManagerInstance extends L2Npc
 			
 			if (fw1 == null || fw2 == null || fw1.getItemId() != 6408 || fw2.getItemId() != 6408)
 				return false;
-			else
-				return true;
 		}
-		
 		return true;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/knownlist/PcKnownList.java

@@ -140,8 +140,7 @@ public class PcKnownList extends PlayableKnownList
 			return 3500;
 		if (knownlistSize <= 70)
 			return 2910;
-		else
-			return 2310;
+		return 2310;
 	}
 	
 	@Override
@@ -157,7 +156,6 @@ public class PcKnownList extends PlayableKnownList
 			return 2900;
 		if (knownlistSize <= 70)
 			return 2300;
-		else
-			return 1700; // Siege, TOI, city
+		return 1700; // Siege, TOI, city
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/ControllableAirShipStat.java

@@ -34,7 +34,6 @@ public class ControllableAirShipStat extends VehicleStat
 	{
 		if (getActiveChar().isInDock() || getActiveChar().getFuel() > 0)
 			return super.getMoveSpeed();
-		else
-			return super.getMoveSpeed() * 0.05f;
+		return super.getMoveSpeed() * 0.05f;
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/stat/NpcStat.java

@@ -43,7 +43,6 @@ public class NpcStat extends CharStat
 			return 1;
 		if (getActiveChar().isRunning())
 			return getRunSpeed() * 1f / getActiveChar().getTemplate().baseRunSpd;
-		else
-			return getWalkSpeed() * 1f / getActiveChar().getTemplate().baseWalkSpd;
+		return getWalkSpeed() * 1f / getActiveChar().getTemplate().baseWalkSpd;
 	}
 }

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

@@ -188,8 +188,7 @@ public final class BlockCheckerEngine
 		{
 			return _redTeamPoints.get(player);
 		}
-		else
-			return _blueTeamPoints.get(player);
+		return _blueTeamPoints.get(player);
 	}
 	
 	/**

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

@@ -228,9 +228,8 @@ public class DimensionalRift
 			DimensionalRiftManager.getInstance().showHtmlFile(player, "data/html/seven_signs/rift/AlreadyTeleported.htm", npc);
 			return;
 		}
-		else
-			_hasJumped = true;
 		
+		_hasJumped = true;
 		DimensionalRiftManager.getInstance().getRoom(_type, _choosenRoom).unspawn().setPartyInside(false);
 		_completedRooms.add(_choosenRoom);
 		_choosenRoom = -1;
@@ -364,8 +363,7 @@ public class DimensionalRift
 		
 		if (isBossRoom)
 			return (long) (time * Config.RIFT_BOSS_ROOM_TIME_MUTIPLY);
-		else
-			return time;
+		return time;
 	}
 	
 	public void memberDead(L2PcInstance player)
@@ -425,7 +423,6 @@ public class DimensionalRift
 	{
 		if (Config.RIFT_MAX_JUMPS <= 8 && Config.RIFT_MAX_JUMPS >= 1)
 			return (byte) Config.RIFT_MAX_JUMPS;
-		else
-			return 4;
+		return 4;
 	}
 }

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

@@ -786,8 +786,7 @@ public class Duel
 		{
 			if (_surrenderRequest == 1)
 				return DuelResultEnum.Team1Surrender;
-			else
-				return DuelResultEnum.Team2Surrender;
+			return DuelResultEnum.Team2Surrender;
 		}
 		// duel timed out
 		else if (getRemainingTime() <= 0)

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

@@ -455,34 +455,32 @@ public class Fort
 			getSiege().announceToPlayer(SystemMessage.getSystemMessage(SystemMessageId.NPCS_RECAPTURED_FORTRESS));
 			return false;
 		}
-		else
+		
+		// Give points to new owner
+		if (updateClansReputation)
+			updateClansReputation(clan, false);
+		
+		spawnSpecialEnvoys();
+		ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSpecialEnvoysDeSpawn(this), 1 * 60 * 60 * 1000); // Prepare 1hr task for special envoys despawn
+		// if clan have already fortress, remove it
+		if (clan.getHasFort() > 0)
+			FortManager.getInstance().getFortByOwner(clan).removeOwner(true);
+		
+		setBloodOathReward(0);
+		setSupplyLvL(0);
+		setOwnerClan(clan);
+		updateOwnerInDB(); // Update in database
+		saveFortVariables();
+		
+		if (getSiege().getIsInProgress()) // If siege in progress
+			getSiege().endSiege();
+		
+		for (L2PcInstance member : clan.getOnlineMembers(0))
 		{
-			// Give points to new owner
-			if (updateClansReputation)
-				updateClansReputation(clan, false);
-			
-			spawnSpecialEnvoys();
-			ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleSpecialEnvoysDeSpawn(this), 1 * 60 * 60 * 1000); // Prepare 1hr task for special envoys despawn
-			// if clan have already fortress, remove it
-			if (clan.getHasFort() > 0)
-				FortManager.getInstance().getFortByOwner(clan).removeOwner(true);
-			
-			setBloodOathReward(0);
-			setSupplyLvL(0);
-			setOwnerClan(clan);
-			updateOwnerInDB(); // Update in database
-			saveFortVariables();
-			
-			if (getSiege().getIsInProgress()) // If siege in progress
-				getSiege().endSiege();
-			
-			for (L2PcInstance member : clan.getOnlineMembers(0))
-			{
-				giveResidentialSkills(member);
-				member.sendSkillList();
-			}
-			return true;
+			giveResidentialSkills(member);
+			member.sendSkillList();
 		}
+		return true;
 	}
 	
 	public void removeOwner(boolean updateDB)

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

@@ -725,7 +725,6 @@ public class FortSiege implements Siegable
 			clearSiegeClan(); // remove all clans
 			// spawn suspicious merchant immediately
 			ThreadPoolManager.getInstance().executeTask(new ScheduleSuspiciousMerchantSpawn());
-			return;
 		}
 		else
 		{

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

@@ -50,7 +50,6 @@ import com.l2jserver.util.ValueSortMap;
  * This ancient thingie got reworked by Nik at $Date: 2011/05/17 21:51:39 $
  * Yeah, for 6 years no one bothered reworking this buggy event engine.
  */
-
 public class L2Event
 {
 	protected static final Logger _log = Logger.getLogger(L2Event.class.getName());
@@ -116,12 +115,10 @@ public class L2Event
 			toReturn.addAll(tmp.keySet());
 			return toReturn;
 		}
-		else
-		{
-			List<L2PcInstance> toReturn = new FastList<L2PcInstance>();
-			toReturn.addAll(tmp.keySet());
-			return toReturn.subList(1, n);
-		}
+		
+		List<L2PcInstance> toReturn = new FastList<L2PcInstance>();
+		toReturn.addAll(tmp.keySet());
+		return toReturn.subList(1, n);
 	}
 
 	public static void showEventHtml(L2PcInstance player, String objectid)

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

@@ -167,10 +167,7 @@ public class Siege implements Siegable
 						_scheduledStartSiegeTask = ThreadPoolManager.getInstance().scheduleGeneral(new ScheduleStartSiegeTask(_castleInst), regTimeRemaining);
 						return;
 					}
-					else
-					{
-						endTimeRegistration(true);
-					}
+					endTimeRegistration(true);
 				}
 				
 				long timeRemaining = getSiegeDate().getTimeInMillis() - Calendar.getInstance().getTimeInMillis();

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

@@ -324,8 +324,7 @@ public class TvTEvent
 				rewardTeam(_teams[1]);
 				return "TvT Event: Event has ended with both teams tying.";
 			}
-			else
-				return "TvT Event: Event has ended with both teams tying.";
+			return "TvT Event: Event has ended with both teams tying.";
 		}
 		
 		// Set state REWARDING so nobody can point anymore

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuction.java

@@ -442,8 +442,7 @@ public final class ItemAuction
 			case FINISHED:
 				if (_startingTime < System.currentTimeMillis() - TimeUnit.MILLISECONDS.convert(Config.ALT_ITEM_AUCTION_EXPIRED_AFTER, TimeUnit.DAYS))
 					return false;
-				else
-					break;
+				break;
 		}
 		
 		final int playerObjId = player.getObjectId();

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java

@@ -915,13 +915,10 @@ public abstract class Inventory extends ItemContainer
 	
 	public synchronized int getPaperdollAugmentationId(int slot)
 	{
-		L2ItemInstance item = _paperdoll[slot];
-		if (item != null)
+		final L2ItemInstance item = _paperdoll[slot];
+		if ((item != null) && (item.getAugmentation() != null))
 		{
-			if (item.getAugmentation() != null)
-				return item.getAugmentation().getAugmentationId();
-			else
-				return 0;
+			return item.getAugmentation().getAugmentationId();
 		}
 		return 0;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java

@@ -37,7 +37,6 @@ import com.l2jserver.gameserver.templates.item.L2Item;
 
 /**
  * @author Advi
- *
  */
 public abstract class ItemContainer
 {
@@ -413,8 +412,6 @@ public abstract class ItemContainer
 				}
 				
 				refreshWeight();
-				
-				return item;
 			}
 			else
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java

@@ -787,8 +787,7 @@ public class PcInventory extends Inventory
 	{
 		if (!questItem)
 			return (_items.size() - _questSlots + slots <= _owner.getInventoryLimit());
-		else
-			return _questSlots + slots <= _owner.getQuestInventoryLimit();
+		return _questSlots + slots <= _owner.getQuestInventoryLimit();
 	}
 	
 	@Override
@@ -893,8 +892,7 @@ public class PcInventory extends Inventory
 	{
 		if (quest)
 			return _questSlots;
-		else
-			return getSize() - _questSlots;
+		return getSize() - _questSlots;
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameManager.java

@@ -101,8 +101,7 @@ public class OlympiadGameManager implements Runnable
 										task.attachGame(newGame);
 										continue;
 									}
-									else
-										readyTeams = false;
+									readyTeams = false;
 								}
 								// if no ready teams found check for classed
 								if (readyClassed != null)
@@ -113,8 +112,7 @@ public class OlympiadGameManager implements Runnable
 										task.attachGame(newGame);
 										continue;
 									}
-									else
-										readyClassed = null;
+									readyClassed = null;
 								}
 							}
 							// 1,3,5,7,9.. arenas used for non-classed
@@ -127,9 +125,8 @@ public class OlympiadGameManager implements Runnable
 									task.attachGame(newGame);
 									continue;
 								}
-								else
-									readyNonClassed = false;
-							}							
+								readyNonClassed = false;
+							}
 						}
 					}
 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/olympiad/OlympiadGameTask.java

@@ -24,9 +24,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
- * 
  * @author DS
- * 
  */
 public final class OlympiadGameTask implements Runnable
 {
@@ -92,8 +90,7 @@ public final class OlympiadGameTask implements Runnable
 			_needAnnounce = false;
 			return true;
 		}
-		else
-			return false;
+		return false;
 	}
 
 	public final L2OlympiadStadiumZone getZone()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -57,7 +57,6 @@ import com.l2jserver.util.Util;
 
 /**
  * @author Luis Arias
- *
  */
 public class Quest extends ManagedScript
 {
@@ -514,8 +513,7 @@ public class Quest extends ManagedScript
 		if (res != null && res.length() > 0)
 			return showResult(player, res);
 		// else tell the player that
-		else
-			player.sendPacket(ActionFailed.STATIC_PACKET);
+		player.sendPacket(ActionFailed.STATIC_PACKET);
 		// note: if the default html for this npc needs to be shown, onFirstTalk should
 		// call npc.showChatWindow(player) and then return null.
 		return true;
@@ -707,8 +705,7 @@ public class Quest extends ManagedScript
 	{
 		if (killer instanceof L2Npc)
 			return onAdvEvent("", (L2Npc) killer, qs.getPlayer());
-		else
-			return onAdvEvent("", null, qs.getPlayer());
+		return onAdvEvent("", null, qs.getPlayer());
 	}
 	
 	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
@@ -1948,8 +1945,7 @@ public class Quest extends ManagedScript
 		_allEventTimers.clear();
 		if (removeFromList)
 			return QuestManager.getInstance().removeQuest(this);
-		else
-			return true;
+		return true;
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/L2ZoneRespawn.java

@@ -24,7 +24,6 @@ import com.l2jserver.util.Rnd;
 /**
  * Abstract zone with spawn locations
  * @author DS, Nyaran (rework 10/07/2011)
- * 
  */
 public abstract class L2ZoneRespawn extends L2ZoneType
 {
@@ -79,8 +78,7 @@ public abstract class L2ZoneRespawn extends L2ZoneType
 	{
 		if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 			return _spawnLocs.get(Rnd.get(_spawnLocs.size()));
-		else
-			return _spawnLocs.get(0);
+		return _spawnLocs.get(0);
 	}
 	
 	public final Location getOtherSpawnLoc()
@@ -89,11 +87,9 @@ public abstract class L2ZoneRespawn extends L2ZoneType
 		{
 			if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 				return _otherSpawnLocs.get(Rnd.get(_otherSpawnLocs.size()));
-			else
-				return _otherSpawnLocs.get(0);
+			return _otherSpawnLocs.get(0);
 		}
-		else
-			return getSpawnLoc();
+		return getSpawnLoc();
 	}
 	
 	public final Location getChaoticSpawnLoc()
@@ -102,11 +98,9 @@ public abstract class L2ZoneRespawn extends L2ZoneType
 		{
 			if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 				return _chaoticSpawnLocs.get(Rnd.get(_chaoticSpawnLocs.size()));
-			else
-				return _chaoticSpawnLocs.get(0);
+			return _chaoticSpawnLocs.get(0);
 		}
-		else
-			return getSpawnLoc();
+		return getSpawnLoc();
 	}
 	
 	public final Location getBanishSpawnLoc()
@@ -115,10 +109,8 @@ public abstract class L2ZoneRespawn extends L2ZoneType
 		{
 			if (Config.RANDOM_RESPAWN_IN_TOWN_ENABLED)
 				return _banishSpawnLocs.get(Rnd.get(_banishSpawnLocs.size()));
-			else
-				return _banishSpawnLocs.get(0);
+			return _banishSpawnLocs.get(0);
 		}
-		else
-			return getSpawnLoc();
+		return getSpawnLoc();
 	}
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java

@@ -30,10 +30,8 @@ import com.l2jserver.gameserver.network.serverpackets.EtcStatusUpdate;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.StringUtil;
 
-
 /**
  * another type of damage zone with skills
- *
  * @author  kerberos
  */
 public class L2EffectZone extends L2ZoneType
@@ -221,8 +219,7 @@ public class L2EffectZone extends L2ZoneType
 	{
 		if (_skills == null || !_skills.containsKey(skillId))
 			return 0;
-		else
-			return _skills.get(skillId);
+		return _skills.get(skillId);
 	}
 	
 	class ApplySkill implements Runnable
@@ -267,5 +264,4 @@ public class L2EffectZone extends L2ZoneType
 	public void onReviveInside(L2Character character)
 	{
 	}
-	
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/network/NpcStringId.java

@@ -25407,10 +25407,7 @@ public final class NpcStringId
 		{
 			return builders.get(0);
 		}
-		else
-		{
-			return new BuilderContainer(builders.toArray(new Builder[builders.size()]));
-		}
+		return new BuilderContainer(builders.toArray(new Builder[builders.size()]));
 	}
 	
 	private final int _id;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -17501,10 +17501,7 @@ public final class SystemMessageId
 		{
 			return builders.get(0);
 		}
-		else
-		{
-			return new BuilderContainer(builders.toArray(new Builder[builders.size()]));
-		}
+		return new BuilderContainer(builders.toArray(new Builder[builders.size()]));
 	}
 	
 	private final int _id;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestAcquireSkill.java

@@ -148,7 +148,6 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 					{
 						giveSkill(activeChar, trainer, skill);
 					}
-					break;
 				}
 				else
 				{
@@ -283,13 +282,11 @@ public final class RequestAcquireSkill extends L2GameClientPacket
 								activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ITEM_MISSING_TO_LEARN_SKILL));
 								return;
 							}
-							else
-							{
-								final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
-								sm.addItemName(itemId);
-								sm.addItemNumber(itemCount);
-								activeChar.sendPacket(sm);
-							}
+							
+							final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.S2_S1_DISAPPEARED);
+							sm.addItemName(itemId);
+							sm.addItemNumber(itemCount);
+							activeChar.sendPacket(sm);
 						}
 						
 						if (rep > 0)

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantItemAttribute.java

@@ -254,8 +254,7 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 		
 		if (item.isWeapon())
 			return Elementals.WEAPON_VALUES[elementItem._type._maxLevel];
-		else
-			return Elementals.ARMOR_VALUES[elementItem._type._maxLevel];
+		return Elementals.ARMOR_VALUES[elementItem._type._maxLevel];
 	}
 	
 	public int getPowerToAdd(int stoneId, int oldValue, L2ItemInstance item)
@@ -266,13 +265,11 @@ public class RequestExEnchantItemAttribute extends L2GameClientPacket
 			{
 				if (oldValue == 0)
 					return Elementals.FIRST_WEAPON_BONUS;
-				else
-					return Elementals.NEXT_WEAPON_BONUS;
+				return Elementals.NEXT_WEAPON_BONUS;
 			}
 			else if (item.isArmor())
 				return Elementals.ARMOR_BONUS;
 		}
-		
 		return 0;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestExRemoveItemAttribute.java

@@ -100,12 +100,10 @@ public class RequestExRemoveItemAttribute extends L2GameClientPacket
 			}
 			activeChar.sendPacket(sm);
 			activeChar.sendPacket(new ExBaseAttributeCancelResult(targetItem.getObjectId(), _element));
-			return;
 		}
 		else
 		{
 			activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_FUNDS_TO_CANCEL_ATTRIBUTE));
-			return;
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestHennaRemove.java

@@ -17,7 +17,6 @@ package com.l2jserver.gameserver.network.clientpackets;
 import com.l2jserver.gameserver.model.L2HennaInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
  * This class ...
@@ -53,10 +52,12 @@ public final class RequestHennaRemove extends L2GameClientPacket
 				if (activeChar.getAdena() >= (henna.getPrice() / 5))
 				{
 					activeChar.removeHenna(i);
-					break;
 				}
 				else
-					activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.YOU_NOT_ENOUGH_ADENA));
+				{
+					activeChar.sendPacket(SystemMessageId.YOU_NOT_ENOUGH_ADENA);
+				}
+				break;
 			}
 		}
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPetUseItem.java

@@ -102,20 +102,18 @@ public final class RequestPetUseItem extends L2GameClientPacket
 			useItem(pet, item, activeChar);
 			return;
 		}
-		else
+		
+		final int itemId = item.getItemId();
+		if (PetDataTable.isPetFood(itemId))
 		{
-			final int itemId = item.getItemId();
-			if (PetDataTable.isPetFood(itemId))
+			if (pet.canEatFoodId(itemId))
+			{
+				useItem(pet, item, activeChar);
+			}
+			else
 			{
-				if (pet.canEatFoodId(itemId))
-				{
-					useItem(pet, item, activeChar);
-				}
-				else
-				{
-					activeChar.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
-					return;
-				}
+				activeChar.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
+				return;
 			}
 		}
 		
@@ -128,7 +126,6 @@ public final class RequestPetUseItem extends L2GameClientPacket
 		{
 			activeChar.sendPacket(SystemMessageId.PET_CANNOT_USE_ITEM);
 		}
-		
 		return;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java

@@ -204,9 +204,8 @@ public final class RequestPreviewItem extends L2GameClientPacket
 				_activeChar.sendPacket(SystemMessageId.YOU_CAN_NOT_TRY_THOSE_ITEMS_ON_AT_THE_SAME_TIME);
 				return;
 			}
-			else
-				_item_list.put(slot, itemId);
 			
+			_item_list.put(slot, itemId);
 			totalPrice += Config.WEAR_PRICE;
 			if (totalPrice > PcInventory.MAX_ADENA)
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRestartPoint.java

@@ -115,8 +115,7 @@ public final class RequestRestartPoint extends L2GameClientPacket
 					{
 						if (activeChar.getClan() == null || activeChar.getClan().getHasCastle() == 0)
 							return;
-						else
-							loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, MapRegionManager.TeleportWhereType.Castle);
+						loc = MapRegionManager.getInstance().getTeleToLocation(activeChar, MapRegionManager.TeleportWhereType.Castle);
 					}
 					if (CastleManager.getInstance().getCastleByOwner(activeChar.getClan())!= null &&
 							CastleManager.getInstance().getCastleByOwner(activeChar.getClan()).getFunction(Castle.FUNC_RESTORE_EXP) != null)

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SSQStatus.java

@@ -330,14 +330,13 @@ public class SSQStatus extends L2GameServerPacket
 									{
 										writeC(SevenSigns.CABAL_DAWN);
 										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
-										break;
 									}
 									else
 									{
 										writeC(SevenSigns.CABAL_NULL);
 										writeD(SystemMessageId.COMPETITION_TIE_SEAL_NOT_AWARDED.getId());
-										break;
 									}
+									break;
 								case SevenSigns.CABAL_DAWN:
 									if (dawnPercent >= 10)
 									{
@@ -377,14 +376,13 @@ public class SSQStatus extends L2GameServerPacket
 									{
 										writeC(SevenSigns.CABAL_DUSK);
 										writeD(SystemMessageId.SEAL_OWNED_10_MORE_VOTED.getId());
-										break;
 									}
 									else
 									{
 										writeC(SevenSigns.CABAL_NULL);
 										writeD(SystemMessageId.COMPETITION_TIE_SEAL_NOT_AWARDED.getId());
-										break;
 									}
+									break;
 								case SevenSigns.CABAL_DAWN:
 									if (dawnPercent >= 35)
 									{

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java

@@ -294,12 +294,10 @@ public class SortedWareHouseWithdrawalList extends L2GameServerPacket
 					return 0;
 				}
 			}
-			else
-			{
-				String s1 = o1.getItemName();
-				String s2 = o2.getItemName();
-				return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1));
-			}
+			
+			String s1 = o1.getItemName();
+			String s2 = o2.getItemName();
+			return (order == A2Z ? s1.compareTo(s2) : s2.compareTo(s1));
 		}
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java

@@ -204,8 +204,7 @@ public final class SystemMessage extends L2GameServerPacket
 		{
 			if (((L2Npc)cha).getTemplate().serverSideName)
 				return addString(((L2Npc)cha).getTemplate().name);
-			else
-				return addNpcName((L2Npc)cha);
+			return addNpcName((L2Npc)cha);
 		}
 		else if (cha instanceof L2PcInstance)
 		{
@@ -215,8 +214,7 @@ public final class SystemMessage extends L2GameServerPacket
 		{
 			if (((L2Summon)cha).getTemplate().serverSideName)
 				return addString(((L2Summon)cha).getTemplate().name);
-			else
-				return addNpcName((L2Summon)cha);
+			return addNpcName((L2Summon)cha);
 		}
 		return addString(cha.getName());
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/network/serverpackets/WareHouseWithdrawalList.java

@@ -51,9 +51,8 @@ public final class WareHouseWithdrawalList extends L2GameServerPacket
 			_log.warning("error while sending withdraw request to: " + _activeChar.getName());
 			return;
 		}
-		else
-			_items = _activeChar.getActiveWarehouse().getItems();
 		
+		_items = _activeChar.getActiveWarehouse().getItems();
 		if (Config.DEBUG)
 			for (L2ItemInstance item : _items)
 				_log.fine("item:" + item.getItem().getName() + " type1:" + item.getItem().getType1() + " type2:" + item.getItem().getType2());

L2J_Server_BETA/java/com/l2jserver/gameserver/pathfinding/PathFinding.java

@@ -34,11 +34,8 @@ public abstract class PathFinding
 			//Higher Memory Usage, Smaller Cpu Usage
 			return GeoPathFinding.getInstance();
 		}
-		else
-			// Cell pathfinding, calculated directly from geodata files
-		{
-			return CellPathFinding.getInstance();
-		}
+		// Cell pathfinding, calculated directly from geodata files
+		return CellPathFinding.getInstance();
 	}
 	
 	public abstract boolean pathNodesExist(short regionoffset);

L2J_Server_BETA/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellNodeBuffer.java

@@ -21,10 +21,8 @@ import javolution.util.FastList;
 import com.l2jserver.Config;
 
 /**
- * 
  * @author DS
  * Credits to Diamond
- *
  */
 public class CellNodeBuffer
 {
@@ -273,8 +271,7 @@ public class CellNodeBuffer
 				newNode.setNext(node.getNext());
 				break;
 			}
-			else
-				node = node.getNext();
+			node = node.getNext();
 		}
 		if (count == MAX_ITERATIONS * 4)
 			System.err.println("Pathfinding: too long loop detected, cost:" + newNode.getCost());

L2J_Server_BETA/java/com/l2jserver/gameserver/pathfinding/cellnodes/CellPathFinding.java

@@ -312,13 +312,11 @@ public class CellPathFinding extends PathFinding
 						i.playableUses++;
 					break;
 				}
-				else
-				{
-					i.overflows++;
-					if (playable)
-						i.playableOverflows++;
-					//System.err.println("Overflow, size requested: " + size + " playable:"+playable);
-				}
+
+				i.overflows++;
+				if (playable)
+					i.playableOverflows++;
+				//System.err.println("Overflow, size requested: " + size + " playable:"+playable);
 			}
 		}
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/pathfinding/geonodes/GeoPathFinding.java

@@ -43,7 +43,6 @@ import com.l2jserver.gameserver.pathfinding.PathFinding;
 import com.l2jserver.gameserver.pathfinding.utils.FastNodeList;
 
 /**
- *
  * @author -Nemesiss-
  */
 public class GeoPathFinding extends PathFinding
@@ -57,18 +56,12 @@ public class GeoPathFinding extends PathFinding
 		return SingletonHolder._instance;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.pathfinding.PathFinding#PathNodesExist(short)
-	 */
 	@Override
 	public boolean pathNodesExist(short regionoffset)
 	{
 		return _pathNodesIndex.containsKey(regionoffset);
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.pathfinding.PathFinding#FindPath(int, int, short, int, int, short)
-	 */
 	@Override
 	public List<AbstractNodeLoc> findPath(int x, int y, int z, int tx, int ty, int tz, int instanceId, boolean playable)
 	{
@@ -141,36 +134,34 @@ public class GeoPathFinding extends PathFinding
 			}
 			if (node.equals(end)) //path found!
 				return constructPath2(node);
-			else
+			
+			i++;
+			visited.add(node);
+			node.attachNeighbors();
+			GeoNode[] neighbors = node.getNeighbors();
+			if (neighbors == null)
+				continue;
+			for (GeoNode n : neighbors)
 			{
-				i++;
-				visited.add(node);
-				node.attachNeighbors();
-				GeoNode[] neighbors = node.getNeighbors();
-				if (neighbors == null)
-					continue;
-				for (GeoNode n : neighbors)
+				if (!visited.containsRev(n) && !to_visit.contains(n))
 				{
-					if (!visited.containsRev(n) && !to_visit.contains(n))
+					added = false;
+					n.setParent(node);
+					dx = targetX - n.getLoc().getNodeX();
+					dy = targetY - n.getLoc().getNodeY();
+					n.setCost(dx * dx + dy * dy);
+					for (int index = 0; index < to_visit.size(); index++)
 					{
-						added = false;
-						n.setParent(node);
-						dx = targetX - n.getLoc().getNodeX();
-						dy = targetY - n.getLoc().getNodeY();
-						n.setCost(dx * dx + dy * dy);
-						for (int index = 0; index < to_visit.size(); index++)
+						// supposed to find it quite early..
+						if (to_visit.get(index).getCost() > n.getCost())
 						{
-							// supposed to find it quite early..
-							if (to_visit.get(index).getCost() > n.getCost())
-							{
-								to_visit.add(index, n);
-								added = true;
-								break;
-							}
+							to_visit.add(index, n);
+							added = true;
+							break;
 						}
-						if (!added)
-							to_visit.addLast(n);
 					}
+					if (!added)
+						to_visit.addLast(n);
 				}
 			}
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/CompiledScriptCache.java

@@ -66,28 +66,25 @@ public class CompiledScriptCache implements Serializable
 			}
 			return csh.getCompiledScript();
 		}
-		else
+		
+		if (Config.DEBUG)
 		{
-			if (Config.DEBUG)
-			{
-				LOG.info("Compiling script: "+file);
-			}
-			Compilable eng = (Compilable) engine;
-			BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
-			
-			// TODO lock file
-			CompiledScript cs = eng.compile(reader);
-			if (cs instanceof Serializable)
+			LOG.info("Compiling script: "+file);
+		}
+		Compilable eng = (Compilable) engine;
+		BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
+		
+		// TODO lock file
+		CompiledScript cs = eng.compile(reader);
+		if (cs instanceof Serializable)
+		{
+			synchronized (_compiledScriptCache)
 			{
-				synchronized (_compiledScriptCache)
-				{
-					_compiledScriptCache.put(relativeName, new CompiledScriptHolder(cs, file));
-					_modified = true;
-				}
+				_compiledScriptCache.put(relativeName, new CompiledScriptHolder(cs, file));
+				_modified = true;
 			}
-			
-			return cs;
 		}
+		return cs;
 	}
 	
 	public boolean isModified()

L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/L2ScriptEngineManager.java

@@ -366,12 +366,8 @@ public final class L2ScriptEngineManager
 					{
 					}
 				}
-				return new CompiledScriptCache();
-			}
-			else
-			{
-				return new CompiledScriptCache();
 			}
+			return new CompiledScriptCache();
 		}
 		return null;
 	}
@@ -395,10 +391,7 @@ public final class L2ScriptEngineManager
 		{
 			throw new ScriptException("No engine registered for extension (" + extension + ")");
 		}
-		else
-		{
-			this.executeScript(engine, file);
-		}
+		executeScript(engine, file);
 	}
 	
 	public void executeScript(String engineName, File file) throws FileNotFoundException, ScriptException
@@ -408,10 +401,7 @@ public final class L2ScriptEngineManager
 		{
 			throw new ScriptException("No engine registered with name (" + engineName + ")");
 		}
-		else
-		{
-			this.executeScript(engine, file);
-		}
+		executeScript(engine, file);
 	}
 	
 	public void executeScript(ScriptEngine engine, File file) throws FileNotFoundException, ScriptException
@@ -513,10 +503,7 @@ public final class L2ScriptEngineManager
 		{
 			throw new IllegalStateException("No engine registered with name (" + engineName + ")");
 		}
-		else
-		{
-			return this.getScriptContext(engine);
-		}
+		return getScriptContext(engine);
 	}
 	
 	public Object eval(ScriptEngine engine, String script, ScriptContext context) throws ScriptException
@@ -527,10 +514,7 @@ public final class L2ScriptEngineManager
 			CompiledScript cs = eng.compile(script);
 			return context != null ? cs.eval(context) : cs.eval();
 		}
-		else
-		{
-			return context != null ? engine.eval(script, context) : engine.eval(script);
-		}
+		return context != null ? engine.eval(script, context) : engine.eval(script);
 	}
 	
 	public Object eval(String engineName, String script) throws ScriptException
@@ -545,10 +529,7 @@ public final class L2ScriptEngineManager
 		{
 			throw new ScriptException("No engine registered with name (" + engineName + ")");
 		}
-		else
-		{
-			return this.eval(engine, script, context);
-		}
+		return eval(engine, script, context);
 	}
 	
 	public Object eval(ScriptEngine engine, String script) throws ScriptException

L2J_Server_BETA/java/com/l2jserver/gameserver/security/SecondaryPasswordAuth.java

@@ -34,7 +34,6 @@ import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Base64;
 
 /**
- * 
  * @author mrTJO
  */
 public class SecondaryPasswordAuth
@@ -227,7 +226,6 @@ public class SecondaryPasswordAuth
 			{
 				_activeClient.sendPacket(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_WRONG, _wrongAttempts));
 				insertWrongAttempt(_wrongAttempts);
-				return false;
 			}
 			else
 			{
@@ -240,8 +238,8 @@ public class SecondaryPasswordAuth
 						_wrongAttempts+" times in row.");
 				insertWrongAttempt(0);
 				_activeClient.close(new Ex2ndPasswordVerify(Ex2ndPasswordVerify.PASSWORD_BAN, Config.SECOND_AUTH_MAX_ATTEMPTS));
-				return false;
 			}
+			return false;
 		}
 		if (!skipAuth)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/Formulas.java

@@ -1937,9 +1937,9 @@ public final class Formulas
 			
 			if (skill) //skills are excluded from crit dmg evasion
 				return success;
-			else
-				// little weird, but remember what CRIT_DAMAGE_EVASION > 1 increase chances to _evade_ crit hits
-				return Rnd.get((int)target.getStat().calcStat(Stats.CRIT_DAMAGE_EVASION, 100, null, null)) < 100;
+			
+			// little weird, but remember what CRIT_DAMAGE_EVASION > 1 increase chances to _evade_ crit hits
+			return Rnd.get((int)target.getStat().calcStat(Stats.CRIT_DAMAGE_EVASION, 100, null, null)) < 100;
 		}
 		return success;
 	}
@@ -2086,8 +2086,9 @@ public final class Formulas
 	{
 		// measured Oct 2006 by Tank6585, formula by Sami
 		// attack speed 312 equals 1500 ms delay... (or 300 + 40 ms delay?)
-		if(rate < 2) return 2700;
-		else return (int)(470000/rate);
+		if(rate < 2)
+			return 2700;
+		return (int) (470000 / rate);
 	}
 	
 	/** Calculate delay (in milliseconds) for skills cast */

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionSiegeZone.java

@@ -76,13 +76,11 @@ public final class ConditionSiegeZone extends Condition
 		{
 			if ((_value & COND_NOT_ZONE) != 0)
 				return true;
-			else
-				return false;
+			return false;
 		}
 		if (castle != null)
 			return checkIfOk(target, castle, _value);
-		else
-			return checkIfOk(target, fort, _value);
+		return checkIfOk(target, fort, _value);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/conditions/ConditionUsingItemType.java

@@ -71,15 +71,13 @@ public final class ConditionUsingItemType extends Condition
 			//return True if chest armor is a Full Armor
 			if (chestBodyPart == L2Item.SLOT_FULL_ARMOR)
 				return true;
-			else
-			{ //check legs armor
-				L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
-				if (legs == null)
-					return false;
-				int legMask = legs.getItem().getItemMask();
-				//return true if legs armor matches too
-				return (_mask & legMask) != 0;
-			}
+			//check legs armor
+			L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
+			if (legs == null)
+				return false;
+			int legMask = legs.getItem().getItemMask();
+			//return true if legs armor matches too
+			return (_mask & legMask) != 0;
 		}
 		return (_mask & inv.getWearedMask()) != 0;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/effects/EffectSignet.java

@@ -86,9 +86,8 @@ public class EffectSignet extends L2Effect
 			getEffector().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 			return false;
 		}
-		else
-			getEffector().reduceCurrentMp(mpConsume);
 		
+		getEffector().reduceCurrentMp(mpConsume);
 		FastList<L2Character> targets = FastList.newInstance();
 		for (L2Character cha : _actor.getKnownList().getKnownCharactersInRadius(getSkill().getSkillRadius()))
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/effects/EffectSignetAntiSummon.java

@@ -95,9 +95,8 @@ public class EffectSignetAntiSummon extends L2Effect
 							getEffector().sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 							return false;
 						}
-						else
-							getEffector().reduceCurrentMp(mpConsume);
 						
+						getEffector().reduceCurrentMp(mpConsume);
 						owner.getPet().unSummon(owner);
 						owner.getAI().notifyEvent(CtrlEvent.EVT_ATTACKED, getEffector());
 					}

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/effects/EffectSignetMDam.java

@@ -153,9 +153,8 @@ public class EffectSignetMDam extends L2Effect
 					caster.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.SKILL_REMOVED_DUE_LACK_MP));
 					return false;
 				}
-				else
-					caster.reduceCurrentMp(mpConsume);
 				
+				caster.reduceCurrentMp(mpConsume);
 				if (cha instanceof L2Playable)
 				{
 					if (caster.canAttackCharacter(cha))

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSiegeFlag.java

@@ -128,8 +128,7 @@ public class L2SkillSiegeFlag extends L2Skill
 			return false;
 		if (castle != null)
 			return checkIfOkToPlaceFlag(activeChar, castle, isCheckOnly);
-		else
-			return checkIfOkToPlaceFlag(activeChar, fort, isCheckOnly);
+		return checkIfOkToPlaceFlag(activeChar, fort, isCheckOnly);
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSummon.java

@@ -183,7 +183,6 @@ public class L2SkillSummon extends L2Skill
 						player.addCubic(_npcId, _cubicSkillLevel, getPower(), _activationtime, _activationchance, _maxcount, _summonTotalLifeTime, true);
 					player.broadcastUserInfo();
 				}
-				return;
 			}
 			else // Normal cubic skill
 			{
@@ -205,8 +204,8 @@ public class L2SkillSummon extends L2Skill
 				}
 				activeChar.addCubic(_npcId, _cubicSkillLevel, getPower(), _activationtime, _activationchance, _maxcount, _summonTotalLifeTime, false);
 				activeChar.broadcastUserInfo();
-				return;
 			}
+			return;
 		}
 		
 		if (activeChar.getPet() != null || activeChar.isMounted()) {

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

@@ -126,8 +126,7 @@ public final class Util
 			double dz = z1 - z2;
 			return Math.sqrt(dx * dx + dy * dy + dz * dz);
 		}
-		else
-			return Math.sqrt(dx * dx + dy * dy);
+		return Math.sqrt(dx * dx + dy * dy);
 	}
 	
 	/**
@@ -211,12 +210,8 @@ public final class Util
 			
 			return d <= range * range + 2 * range * rad + rad * rad;
 		}
-		else
-		{
-			double d = dx * dx + dy * dy;
-			
-			return d <= range * range + 2 * range * rad + rad * rad;
-		}
+		double d = dx * dx + dy * dy;
+		return d <= range * range + 2 * range * rad + rad * rad;
 	}
 	
 	/**
@@ -242,8 +237,7 @@ public final class Util
 			int dz = obj1.getZ() - obj2.getZ();
 			return dx * dx + dy * dy + dz * dz <= radius * radius;
 		}
-		else
-			return dx * dx + dy * dy <= radius * radius;
+		return dx * dx + dy * dy <= radius * radius;
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/loginserver/LoginController.java

@@ -263,10 +263,7 @@ public class LoginController
 				_bannedIps.remove(address.getHostAddress());
 				return false;
 			}
-			else
-			{
-				return true;
-			}
+			return true;
 		}
 		return false;
 	}
@@ -559,7 +556,6 @@ public class LoginController
 						Log.add("'" + user + "' " + address.getHostAddress() + " - ERR : ErrCreatingACC", "loginlog");
 					
 					_log.warning("Invalid username creation/use attempt: " + user);
-					return false;
 				}
 				else
 				{
@@ -586,53 +582,51 @@ public class LoginController
 								+ failedCount + " invalid user name attempts");
 						this.addBanForAddress(address, Config.LOGIN_BLOCK_AFTER_BAN * 1000);
 					}
-					return false;
 				}
+				return false;
 			}
-			else
+			
+			// is this account banned?
+			if (access < 0)
 			{
-				// is this account banned?
-				if (access < 0)
-				{
-					if (Config.LOG_LOGIN_CONTROLLER)
-						Log.add("'" + user + "' " + address.getHostAddress() + " - ERR : AccountBanned", "loginlog");
-					
-					client.setAccessLevel(access);
-					return false;
-				}
-				// Check IP
-				if (userIP != null)
+				if (Config.LOG_LOGIN_CONTROLLER)
+					Log.add("'" + user + "' " + address.getHostAddress() + " - ERR : AccountBanned", "loginlog");
+				
+				client.setAccessLevel(access);
+				return false;
+			}
+			// Check IP
+			if (userIP != null)
+			{
+				if(!isValidIPAddress(userIP))
 				{
-					if(!isValidIPAddress(userIP))
+					// Address is not valid so it's a domain name, get IP
+					try
 					{
-						// Address is not valid so it's a domain name, get IP
-						try
-						{
-							InetAddress addr = InetAddress.getByName(userIP);
-							userIP = addr.getHostAddress();
-						}
-						catch(Exception e)
-						{
-							return false;
-						}
+						InetAddress addr = InetAddress.getByName(userIP);
+						userIP = addr.getHostAddress();
 					}
-					if(!address.getHostAddress().equalsIgnoreCase(userIP))
+					catch(Exception e)
 					{
-						if (Config.LOG_LOGIN_CONTROLLER)
-							Log.add("'" + user + "' " + address.getHostAddress() + "/" + userIP + " - ERR : INCORRECT IP", "loginlog");
-					
 						return false;
 					}
 				}
-				// check password hash
-				ok = true;
-				for (int i = 0; i < expected.length; i++)
+				if(!address.getHostAddress().equalsIgnoreCase(userIP))
 				{
-					if (hash[i] != expected[i])
-					{
-						ok = false;
-						break;
-					}
+					if (Config.LOG_LOGIN_CONTROLLER)
+						Log.add("'" + user + "' " + address.getHostAddress() + "/" + userIP + " - ERR : INCORRECT IP", "loginlog");
+				
+					return false;
+				}
+			}
+			// check password hash
+			ok = true;
+			for (int i = 0; i < expected.length; i++)
+			{
+				if (hash[i] != expected[i])
+				{
+					ok = false;
+					break;
 				}
 			}