BETA: Fix for Armor Sets and Henna bonuses not working on first player login:

	* Thanks FinalDestination and Adry_85 for reports.
	* Thanks MELERIX for testing.
	* Minor formatting.

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncArmorSet.java

@@ -36,7 +36,7 @@ public class FuncArmorSet extends Func
 	{
 		if (!_fh_instance.containsKey(st))
 		{
-			return _fh_instance.put(st, new FuncArmorSet(st));
+			_fh_instance.put(st, new FuncArmorSet(st));
 		}
 		return _fh_instance.get(st);
 	}
@@ -56,7 +56,7 @@ public class FuncArmorSet extends Func
 			if (chest != null)
 			{
 				L2ArmorSet set = ArmorSetsData.getInstance().getSet(chest.getItemId());
-				if (set != null && set.containAll(player))
+				if ((set != null) && set.containAll(player))
 				{
 					switch (stat)
 					{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncAtkAccuracy.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncAtkAccuracy extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncAtkCritical.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncAtkCritical extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncAtkEvasion.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncAtkEvasion extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncBowAtkRange.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncBowAtkRange extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncCrossBowAtkRange.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncCrossBowAtkRange extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncGatesMDefMod.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncGatesMDefMod extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncGatesPDefMod.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncGatesPDefMod extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncHenna.java

@@ -33,7 +33,7 @@ public class FuncHenna extends Func
 	{
 		if (!_fh_instance.containsKey(st))
 		{
-			return _fh_instance.put(st, new FuncHenna(st));
+			_fh_instance.put(st, new FuncHenna(st));
 		}
 		return _fh_instance.get(st);
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMAtkCritical.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMAtkCritical extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMAtkMod.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMAtkMod extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMAtkSpeed.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMAtkSpeed extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMDefMod.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMDefMod extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMaxCpAdd.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMaxCpAdd extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMaxCpMul.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMaxCpMul extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMaxHpAdd.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMaxHpAdd extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMaxHpMul.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMaxHpMul extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMaxMpAdd.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMaxMpAdd extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMaxMpMul.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMaxMpMul extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncMoveSpeed.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncMoveSpeed extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncPAtkMod.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncPAtkMod extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncPAtkSpeed.java

@@ -21,7 +21,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncPAtkSpeed extends Func
 {

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/funcs/formulas/FuncPDefMod.java

@@ -24,7 +24,6 @@ import com.l2jserver.gameserver.model.stats.Stats;
 
 /**
  * @author UnAfraid
- *
  */
 public class FuncPDefMod extends Func
 {