janiii 15 tahun lalu
induk
melakukan
f49d0da831
85 mengubah file dengan 418 tambahan dan 918 penghapusan
  1. 0 1
      L2_GameServer/java/com/l2jserver/L2DatabaseFactory.java
  2. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/LoginServerThread.java
  3. 0 7
      L2_GameServer/java/com/l2jserver/gameserver/PacketHistory.java
  4. 2 5
      L2_GameServer/java/com/l2jserver/gameserver/TaskPriority.java
  5. 0 13
      L2_GameServer/java/com/l2jserver/gameserver/ThreadPoolManager.java
  6. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/ai/L2DoorAI.java
  7. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/ai2/AiManager.java
  8. 0 2
      L2_GameServer/java/com/l2jserver/gameserver/communitybbs/BB/Topic.java
  9. 0 4
      L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/ClanBBSManager.java
  10. 0 11
      L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java
  11. 0 13
      L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/TopBBSManager.java
  12. 1 10
      L2_GameServer/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java
  13. 0 2
      L2_GameServer/java/com/l2jserver/gameserver/model/L2UIKeysSettings.java
  14. 0 43
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java
  15. 7 31
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/knownlist/NullKnownList.java
  16. 0 16
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/stat/NpcStat.java
  17. 2 19
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java
  18. 2 13
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java
  19. 3 15
      L2_GameServer/java/com/l2jserver/gameserver/model/entity/FortSiege.java
  20. 0 15
      L2_GameServer/java/com/l2jserver/gameserver/model/quest/Quest.java
  21. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java
  22. 5 13
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java
  23. 20 27
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java
  24. 13 19
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOffVehicle.java
  25. 20 27
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java
  26. 4 6
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java
  27. 21 29
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPCCafeCouponUse.java
  28. 24 30
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java
  29. 34 41
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java
  30. 5 13
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java
  31. 6 13
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestWriteHeroWords.java
  32. 5 14
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdCharacterInfo.java
  33. 5 14
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdServerStatus.java
  34. 6 16
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdSummonCmd.java
  35. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/AdminForgePacket.java
  36. 0 7
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/GetOffVehicle.java
  37. 0 9
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java
  38. 0 7
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/VehicleCheckLocation.java
  39. 0 7
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/VehicleDeparture.java
  40. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/script/EngineInterface.java
  41. 0 4
      L2_GameServer/java/com/l2jserver/gameserver/script/ScriptEngine.java
  42. 5 6
      L2_GameServer/java/com/l2jserver/gameserver/script/ScriptPackage.java
  43. 0 10
      L2_GameServer/java/com/l2jserver/gameserver/script/faenor/FaenorInterface.java
  44. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/DocumentBase.java
  45. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/DocumentItem.java
  46. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/SkillsEngine.java
  47. 7 11
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerHp.java
  48. 6 10
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerLevel.java
  49. 8 10
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerRace.java
  50. 30 34
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerState.java
  51. 7 11
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionSkillStats.java
  52. 6 9
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionSlotItemId.java
  53. 6 8
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionSlotItemType.java
  54. 9 11
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetAggro.java
  55. 31 33
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetBodyPart.java
  56. 7 9
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetLevel.java
  57. 6 8
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetNone.java
  58. 18 20
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetRace.java
  59. 8 12
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java
  60. 18 16
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionUsingItemType.java
  61. 4 8
      L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionUsingSkill.java
  62. 0 11
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBuff.java
  63. 0 12
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectEnemyCharge.java
  64. 0 16
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectGrow.java
  65. 0 19
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobilePetBuff.java
  66. 0 19
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRoot.java
  67. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectStun.java
  68. 30 20
      L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/FuncTemplate.java
  69. 2 4
      L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/Lambda.java
  70. 2 4
      L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaCalc.java
  71. 2 4
      L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaConst.java
  72. 2 4
      L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaRnd.java
  73. 2 5
      L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaStats.java
  74. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillChargeDmg.java
  75. 0 12
      L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSummon.java
  76. 0 1
      L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillTeleport.java
  77. 0 3
      L2_GameServer/java/com/l2jserver/gameserver/templates/chars/L2PcTemplate.java
  78. 0 2
      L2_GameServer/java/com/l2jserver/gsregistering/BaseGameServerRegister.java
  79. 0 1
      L2_GameServer/java/com/l2jserver/loginserver/FloodProtectedListener.java
  80. 0 5
      L2_GameServer/java/com/l2jserver/loginserver/GameServerThread.java
  81. 0 1
      L2_GameServer/java/com/l2jserver/loginserver/L2LoginServer.java
  82. 0 1
      L2_GameServer/java/com/l2jserver/util/network/BaseSendablePacket.java
  83. 10 3
      L2_GameServer/java/config/loginserver.properties
  84. 3 3
      L2_GameServer/java/config/server.properties
  85. 0 1
      L2_GameServer/javaTest/com/l2jserver/gameserver/idfactory/IDFactoryTest.java

+ 0 - 1
L2_GameServer/java/com/l2jserver/L2DatabaseFactory.java

@@ -255,7 +255,6 @@ public class L2DatabaseFactory
 			}
 			catch (SQLException e)
 			{
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 			

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -326,8 +326,8 @@ public class LoginServerThread extends Thread
 								}
 								else
 								{
-									_log.warning("session key is not correct. closing connection");
-									wcToRemove.gameClient.getConnection().sendPacket(new LoginFail(1));
+									_log.warning("Session key is not correct. Closing connection for account " + wcToRemove.account + ".");
+									wcToRemove.gameClient.getConnection().sendPacket(new LoginFail(LoginFail.SYSTEM_ERROR_LOGIN_LATER));
 									wcToRemove.gameClient.closeNow();
 								}
 								_waitingClients.remove(wcToRemove);

+ 0 - 7
L2_GameServer/java/com/l2jserver/gameserver/PacketHistory.java

@@ -37,9 +37,6 @@ class PacketHistory
 
     protected static final XMLFormat<PacketHistory> PACKET_HISTORY_XML = new XMLFormat<PacketHistory>(PacketHistory.class)
     {
-        /**
-		 * @see javolution.xml.XMLFormat#read(javolution.xml.XMLFormat.InputElement, java.lang.Object)
-		 */
 		@Override
 		public void read(InputElement xml, PacketHistory packetHistory) throws XMLStreamException
 		{
@@ -47,13 +44,9 @@ class PacketHistory
 			packetHistory._info = xml.<Map<Class<?>, Long>> get("info");
 		}
 
-		/**
-		 * @see javolution.xml.XMLFormat#write(java.lang.Object, javolution.xml.XMLFormat.OutputElement)
-		 */
 		@Override
 		public void write(PacketHistory packetHistory, OutputElement xml) throws XMLStreamException
 		{
-			// TODO Auto-generated method stub
 			xml.setAttribute("time-stamp", new Date(packetHistory._timeStamp).toString());
 
 			for (Class<?> cls : packetHistory._info.keySet())

+ 2 - 5
L2_GameServer/java/com/l2jserver/gameserver/TaskPriority.java

@@ -16,11 +16,8 @@ package com.l2jserver.gameserver;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public enum TaskPriority {
+public enum TaskPriority
+{
 	PR_NORMAL, PR_HIGH, PR_URGENT;
-
 }

+ 0 - 13
L2_GameServer/java/com/l2jserver/gameserver/ThreadPoolManager.java

@@ -291,9 +291,6 @@ public class ThreadPoolManager
 			_group = new ThreadGroup(_name);
 		}
 		
-		/* (non-Javadoc)
-		 * @see java.util.concurrent.ThreadFactory#newThread(java.lang.Runnable)
-		 */
 		public Thread newThread(Runnable r)
 		{
 			Thread t = new Thread(_group, r);
@@ -308,9 +305,6 @@ public class ThreadPoolManager
 		}
 	}
 	
-	/**
-	 *
-	 */
 	public void shutdown()
 	{
 		_shutdown = true;
@@ -331,7 +325,6 @@ public class ThreadPoolManager
 		}
 		catch (InterruptedException e)
 		{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}
@@ -341,9 +334,6 @@ public class ThreadPoolManager
 		return _shutdown;
 	}
 	
-	/**
-	 *
-	 */
 	public void purge()
 	{
 		_effectsScheduledThreadPool.purge();
@@ -354,9 +344,6 @@ public class ThreadPoolManager
 		_generalThreadPool.purge();
 	}
 	
-	/**
-	 *
-	 */
 	public String getPacketStats()
 	{
 		final StringBuilder sb = new StringBuilder(1000);

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/ai/L2DoorAI.java

@@ -24,9 +24,6 @@ import com.l2jserver.gameserver.model.actor.instance.L2DefenderInstance;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class L2DoorAI extends L2CharacterAI
 {

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/ai2/AiManager.java

@@ -167,7 +167,6 @@ public class AiManager
 		}
 		catch (IOException e1)
 		{
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
 		// build a mighty map

+ 0 - 2
L2_GameServer/java/com/l2jserver/gameserver/communitybbs/BB/Topic.java

@@ -131,13 +131,11 @@ public class Topic
 	 */
 	public String getName()
 	{
-		// TODO Auto-generated method stub
 		return _topicName;
 	}
 	
 	public String getOwnerName()
 	{
-		// TODO Auto-generated method stub
 		return _ownerName;
 	}
 	

+ 0 - 4
L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/ClanBBSManager.java

@@ -363,13 +363,9 @@ public class ClanBBSManager extends BaseBBSManager
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.communitybbs.Manager.BaseBBSManager#parsewrite(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
-	 */
 	@Override
 	public void parsewrite(String ar1, String ar2, String ar3, String ar4, String ar5, L2PcInstance activeChar)
 	{
-		// TODO Auto-generated method stub
 		if (ar1.equals("Set"))
 		{
 			activeChar.getClan().setNotice(ar4);

+ 0 - 11
L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java

@@ -96,14 +96,9 @@ public class ForumsBBSManager extends BaseBBSManager
 		}
 	}
 	
-	/* (non-Javadoc)
-	 * @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)
 	{
-		// TODO Auto-generated method stub
-		
 	}
 	
 	/**
@@ -132,7 +127,6 @@ public class ForumsBBSManager extends BaseBBSManager
 	{
 		Forum forum = new Forum(name, parent, type, perm, oid);
 		forum.insertIntoDb();
-		//addForum(forum); // not needed to addForum(Forum) because already called in new Forum(String, Forum, int, int, int)
 		return forum;
 	}
 	
@@ -160,14 +154,9 @@ public class ForumsBBSManager extends BaseBBSManager
 		return null;
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.communitybbs.Manager.BaseBBSManager#parsewrite(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
-	 */
 	@Override
 	public void parsewrite(String ar1, String ar2, String ar3, String ar4, String ar5, L2PcInstance activeChar)
 	{
-		// TODO Auto-generated method stub
-		
 	}
 	
 	@SuppressWarnings("synthetic-access")

+ 0 - 13
L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/TopBBSManager.java

@@ -27,10 +27,6 @@ public class TopBBSManager 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)
 	{
@@ -75,20 +71,11 @@ public class TopBBSManager extends BaseBBSManager
 		}
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.communitybbs.Manager.BaseBBSManager#parsewrite(java.lang.String, java.lang.String, java.lang.String, java.lang.String, java.lang.String, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
-	 */
 	@Override
 	public void parsewrite(String ar1, String ar2, String ar3, String ar4, String ar5, L2PcInstance activeChar)
 	{
-		// TODO Auto-generated method stub
-		
 	}
 	
-	/**
-	 * @return
-	 */
 	public static TopBBSManager getInstance()
 	{
 		return SingletonHolder._instance;

+ 1 - 10
L2_GameServer/java/com/l2jserver/gameserver/instancemanager/MercTicketManager.java

@@ -115,16 +115,12 @@ public class MercTicketManager
 	
 	private static final int GUARDIAN_TYPES_COUNT = 52;
 	
-	// =========================================================
-	// Constructor
 	private MercTicketManager()
 	{
 		_log.info("Initializing MercTicketManager");
 		load();
 	}
 	
-	// =========================================================
-	// Method - Public
 	// returns the castleId for the passed ticket item id
 	public int getTicketCastleId(int itemId)
 	{
@@ -146,8 +142,6 @@ public class MercTicketManager
 		load();
 	}
 	
-	// =========================================================
-	// Method - Private
 	private final void load()
 	{
 		Connection con = null;
@@ -191,7 +185,6 @@ public class MercTicketManager
 					if (NPC_IDS[i] == npcId) // Find the index of the item used
 					{
 						// only handle tickets if a siege is not ongoing in this npc's castle
-						
 						if ((castle != null) && !(castle.getSiege().getIsInProgress()))
 						{
 							itemId = ITEM_IDS[i];
@@ -227,8 +220,6 @@ public class MercTicketManager
 		}
 	}
 	
-	// =========================================================
-	// Property - Public
 	/**
 	 * Checks if the passed item has reached the limit of number of dropped
 	 * tickets that this SPECIFIC item may have in its castle
@@ -326,7 +317,7 @@ public class MercTicketManager
 			{
 				spawnMercenary(NPC_IDS[i], x, y, z, 3000, messages, 0);
 				
-				// Hire merc for this caslte.  NpcId is at the same index as the item used.
+				// Hire merc for this castle.  NpcId is at the same index as the item used.
 				castle.getSiege().getSiegeGuardManager().hireMerc(x, y, z, heading, NPC_IDS[i]);
 				
 				// create the ticket in the gameworld

+ 0 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/L2UIKeysSettings.java

@@ -203,7 +203,6 @@ public class L2UIKeysSettings
 			}
 			catch (SQLException e)
 			{
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}
@@ -253,7 +252,6 @@ public class L2UIKeysSettings
 			}
 			catch (SQLException e)
 			{
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
 		}

+ 0 - 43
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2BoatInstance.java

@@ -818,87 +818,44 @@ public class L2BoatInstance extends L2Character
 		_t2 = new L2BoatTrajet(idWaypoint1, idWTicket1, ntx1, nty1, ntz1, idnpc1, sysmess10_1, sysmess5_1, sysmess1_1, sysmess0_1, sysmessb_1, _name);
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Character#updateAbnormalEffect()
-	 */
 	@Override
 	public void updateAbnormalEffect()
 	{
-		// TODO Auto-generated method stub
-		
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Character#getActiveWeaponInstance()
-	 */
 	@Override
 	public L2ItemInstance getActiveWeaponInstance()
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Character#getActiveWeaponItem()
-	 */
 	@Override
 	public L2Weapon getActiveWeaponItem()
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Character#getSecondaryWeaponInstance()
-	 */
 	@Override
 	public L2ItemInstance getSecondaryWeaponInstance()
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Character#getSecondaryWeaponItem()
-	 */
 	@Override
 	public L2Weapon getSecondaryWeaponItem()
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Character#getLevel()
-	 */
 	@Override
 	public int getLevel()
 	{
-		// TODO Auto-generated method stub
 		return 0;
 	}
 	
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Object#isAutoAttackable(com.l2jserver.gameserver.model.L2Character)
-	 */
 	@Override
 	public boolean isAutoAttackable(L2Character attacker)
 	{
-		// TODO Auto-generated method stub
 		return false;
 	}
 	

+ 7 - 31
L2_GameServer/java/com/l2jserver/gameserver/model/actor/knownlist/NullKnownList.java

@@ -18,64 +18,40 @@ import com.l2jserver.gameserver.model.L2Object;
 
 public class NullKnownList extends ObjectKnownList
 {
-
-	/**
-	 * @param activeObject
-	 */
 	public NullKnownList(L2Object activeObject)
 	{
 		super(activeObject);
-		// TODO Auto-generated constructor stub
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList#addKnownObject(com.l2jserver.gameserver.model.L2Object)
-	 */
+	
 	@Override
 	public boolean addKnownObject(L2Object object)
 	{
 		return false;
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList#getActiveObject()
-	 */
+	
 	@Override
 	public L2Object getActiveObject()
 	{
 		return super.getActiveObject();
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList#getDistanceToForgetObject(com.l2jserver.gameserver.model.L2Object)
-	 */
+	
 	@Override
 	public int getDistanceToForgetObject(L2Object object)
 	{
 		return 0;
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList#getDistanceToWatchObject(com.l2jserver.gameserver.model.L2Object)
-	 */
+	
 	@Override
 	public int getDistanceToWatchObject(L2Object object)
 	{
 		return 0;
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList#removeAllKnownObjects()
-	 *
-	 * no-op
-	 */
+	
 	@Override
 	public void removeAllKnownObjects()
-	{ }
+	{
+	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.actor.knownlist.ObjectKnownList#removeKnownObject(com.l2jserver.gameserver.model.L2Object)
-	 */
 	@Override
 	protected boolean removeKnownObject(L2Object object, boolean forget)
 	{

+ 0 - 16
L2_GameServer/java/com/l2jserver/gameserver/model/actor/stat/NpcStat.java

@@ -19,17 +19,9 @@ import com.l2jserver.gameserver.skills.Stats;
 
 public class NpcStat extends CharStat
 {
-    // =========================================================
-    // Data Field
-
-    // =========================================================
-    // Constructor
     public NpcStat(L2Npc activeChar)
     {
         super(activeChar);
-
-        //TODO: Since this class is now init BEFORE the Npc is fully init, we can not do this here. Overwritten getLevel() is a temp solution.  
-        //setLevel(getActiveChar().getTemplate().level);
     }
 
     @Override
@@ -38,14 +30,6 @@ public class NpcStat extends CharStat
     	return getActiveChar().getTemplate().level;
     }
     
-    // =========================================================
-    // Method - Public
-
-    // =========================================================
-    // Method - Private
-
-    // =========================================================
-    // Property - Public
     @Override
 	public L2Npc getActiveChar() { return (L2Npc)super.getActiveChar(); }
 

+ 2 - 19
L2_GameServer/java/com/l2jserver/gameserver/model/actor/stat/PetStat.java

@@ -27,27 +27,15 @@ import com.l2jserver.gameserver.skills.Stats;
 
 public class PetStat extends SummonStat
 {
-    // =========================================================
-    // Data Field
-
-    // =========================================================
-    // Constructor
     public PetStat(L2PetInstance activeChar)
     {
         super(activeChar);
     }
-
-    // =========================================================
-    // Method - Public
+    
     public boolean addExp(int value)
     {
         if (!super.addExp(value)) return false;
 
-		/* Micht : Use of PetInfo for C5
-        StatusUpdate su = new StatusUpdate(getActiveChar().getObjectId());
-        su.addAttribute(StatusUpdate.EXP, getExp());
-        getActiveChar().broadcastPacket(su);
-        */
         getActiveChar().updateAndBroadcastStatus(1);
         // The PetInfo packet wipes the PartySpelled (list of active  spells' icons).  Re-add them
         getActiveChar().updateEffectIcons(true);
@@ -109,12 +97,7 @@ public class PetStat extends SummonStat
     		return 5000000L*level; // temp value calculated from lvl 81 wyvern, 395734658
     	}
     }
-
-    // =========================================================
-    // Method - Private
-
-    // =========================================================
-    // Property - Public
+    
     @Override
 	public L2PetInstance getActiveChar() { return (L2PetInstance)super.getActiveChar(); }
 

+ 2 - 13
L2_GameServer/java/com/l2jserver/gameserver/model/actor/stat/PlayableStat.java

@@ -31,18 +31,12 @@ import com.l2jserver.gameserver.network.communityserver.writepackets.WorldInfo;
 public class PlayableStat extends CharStat
 {
     protected static final Logger _log = Logger.getLogger(PlayableStat.class.getName());
-    // =========================================================
-    // Data Field
 
-    // =========================================================
-    // Constructor
     public PlayableStat(L2Playable activeChar)
     {
         super(activeChar);
     }
-
-    // =========================================================
-    // Method - Public
+    
     public boolean addExp(long value)
     {
 		if ((getExp() + value) < 0 || (value > 0 && getExp() == (getExpForLevel(Experience.MAX_LEVEL) - 1)))
@@ -196,12 +190,7 @@ public class PlayableStat extends CharStat
 		
 		return val;
     }
-
-    // =========================================================
-    // Method - Private
-
-    // =========================================================
-    // Property - Public
+    
     @Override
 	public L2Playable getActiveChar() { return (L2Playable)super.getActiveChar(); }
 }

+ 3 - 15
L2_GameServer/java/com/l2jserver/gameserver/model/entity/FortSiege.java

@@ -1303,34 +1303,22 @@ public class FortSiege implements Siegable
 	{
 		return _commanders;
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.entity.Siegable#getDefenderClan(int)
-	 */
+	
 	@Override
 	public L2SiegeClan getDefenderClan(int clanId)
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.entity.Siegable#getDefenderClan(com.l2jserver.gameserver.model.L2Clan)
-	 */
+	
 	@Override
 	public L2SiegeClan getDefenderClan(L2Clan clan)
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.model.entity.Siegable#getDefenderClans()
-	 */
+	
 	@Override
 	public List<L2SiegeClan> getDefenderClans()
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 }

+ 0 - 15
L2_GameServer/java/com/l2jserver/gameserver/model/quest/Quest.java

@@ -1696,27 +1696,18 @@ public class Quest extends ManagedScript
 		return questItemIds;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.scripting.ManagedScript#getScriptName()
-	 */
 	@Override
 	public String getScriptName()
 	{
 		return this.getName();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.scripting.ManagedScript#setActive(boolean)
-	 */
 	@Override
 	public void setActive(boolean status)
 	{
 		// TODO implement me
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.scripting.ManagedScript#reload()
-	 */
 	@Override
 	public boolean reload()
 	{
@@ -1724,9 +1715,6 @@ public class Quest extends ManagedScript
 		return super.reload();
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.scripting.ManagedScript#unload()
-	 */
 	@Override
 	public boolean unload()
 	{
@@ -1750,9 +1738,6 @@ public class Quest extends ManagedScript
 			return true;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.scripting.ManagedScript#getScriptManager()
-	 */
 	@Override
 	public ScriptManager<?> getScriptManager()
 	{

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestBypassToServer.java

@@ -94,8 +94,8 @@ public final class RequestBypassToServer extends L2GameClientPacket
 
 				if (!AdminCommandAccessRights.getInstance().hasAccess(command, activeChar.getAccessLevel()))
 				{
-					activeChar.sendMessage("You don't have the access right to use this command!");
-					_log.warning("Character " + activeChar.getName() + " tryed to use admin command " + command + ", but have no access to it!");
+					activeChar.sendMessage("You don't have the access rights to use this command!");
+					_log.warning("Character " + activeChar.getName() + " tried to use admin command " + command + ", without proper access level!");
 					return;
 				}
 				if (Config.GMAUDIT)

+ 5 - 13
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestDismissPartyRoom.java

@@ -27,33 +27,25 @@ public class RequestDismissPartyRoom extends L2GameClientPacket
 	private static final String _C__D0_02_REQUESTDISMISSPARTYROOM = "[C] D0:02 RequestDismissPartyRoom";
 	private int _data1;
 	private int _data2;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_data1 = readD();
 		_data2 = readD();
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
+	
 	@Override
 	protected void runImpl()
 	{
-		// TODO Auto-generated method stub
 		_log.info("This packet is not well known : RequestDismissPartyRoom");
-		_log.info("Data received: d:"+_data1+" d:"+_data2);
-
+		_log.info("Data received: d:" + _data1 + " d:" + _data2);
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{
 		return _C__D0_02_REQUESTDISMISSPARTYROOM;
 	}
-
+	
 }

+ 20 - 27
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExitPartyMatchingWaitingRoom.java

@@ -24,32 +24,25 @@ import java.util.logging.Logger;
  */
 public final class RequestExitPartyMatchingWaitingRoom extends L2GameClientPacket
 {
-    protected static final Logger _log = Logger.getLogger(RequestExitPartyMatchingWaitingRoom.class.getName());
-    private static final String _C__D0_17_REQUESTEXITPARTYMATCHINGWAITINGROOM = "[C] D0:17 RequestExitPartyMatchingWaitingRoom";
-
-    @Override
+	protected static final Logger _log = Logger.getLogger(RequestExitPartyMatchingWaitingRoom.class.getName());
+	private static final String _C__D0_17_REQUESTEXITPARTYMATCHINGWAITINGROOM = "[C] D0:17 RequestExitPartyMatchingWaitingRoom";
+	
+	@Override
 	protected void readImpl()
-    {
-    	//trigger
-    }
-
-    /**
-     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-     */
-    @Override
+	{
+		//trigger
+	}
+	
+	@Override
 	protected void runImpl()
-    {
-        // TODO
-        _log.info("C5: RequestExitPartyMatchingWaitingRoom");
-    }
-
-    /**
-     * @see com.l2jserver.gameserver.BasePacket#getType()
-     */
-    @Override
-    public String getType()
-    {
-        return _C__D0_17_REQUESTEXITPARTYMATCHINGWAITINGROOM;
-    }
-
-}
+	{
+		_log.info("C5: RequestExitPartyMatchingWaitingRoom");
+	}
+	
+	@Override
+	public String getType()
+	{
+		return _C__D0_17_REQUESTEXITPARTYMATCHINGWAITINGROOM;
+	}
+	
+}

+ 13 - 19
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestGetOffVehicle.java

@@ -19,43 +19,37 @@ import com.l2jserver.gameserver.model.actor.instance.L2BoatInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.GetOffVehicle;
 
-
 /**
  * @author Maktakien
- *
  */
 public final class RequestGetOffVehicle extends L2GameClientPacket
 {
-	 private int _id, _x, _y, _z;
-
+	private int _id, _x, _y, _z;
+	
 	@Override
 	protected void readImpl()
 	{
-		_id  = readD();
-		_x  = readD();
-		_y  = readD();
-		_z  = readD();
+		_id = readD();
+		_x = readD();
+		_y = readD();
+		_z = readD();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance activeChar = getClient().getActiveChar();
-		if(activeChar == null)
+		if (activeChar == null)
 			return;
-        L2BoatInstance boat = BoatManager.getInstance().getBoat(_id);
-        GetOffVehicle Gon = new GetOffVehicle(activeChar,boat,_x,_y,_z);
-        activeChar.broadcastPacket(Gon);
+		L2BoatInstance boat = BoatManager.getInstance().getBoat(_id);
+		GetOffVehicle Gon = new GetOffVehicle(activeChar, boat, _x, _y, _z);
+		activeChar.broadcastPacket(Gon);
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{
-		// TODO Auto-generated method stub
 		return "[S] 5d GetOffVehicle";
 	}
-
+	
 }

+ 20 - 27
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestListPartyMatchingWaitingRoom.java

@@ -24,32 +24,25 @@ import java.util.logging.Logger;
  */
 public class RequestListPartyMatchingWaitingRoom extends L2GameClientPacket
 {
-    protected static final Logger _log = Logger.getLogger(RequestListPartyMatchingWaitingRoom.class.getName());
-    private static final String _C__D0_16_REQUESTLISTPARTYMATCHINGWAITINGROOM = "[C] D0:16 RequestListPartyMatchingWaitingRoom";
-
-    @Override
+	protected static final Logger _log = Logger.getLogger(RequestListPartyMatchingWaitingRoom.class.getName());
+	private static final String _C__D0_16_REQUESTLISTPARTYMATCHINGWAITINGROOM = "[C] D0:16 RequestListPartyMatchingWaitingRoom";
+	
+	@Override
 	protected void readImpl()
-    {
-    	// trigger
-    }
-
-    /**
-     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-     */
-    @Override
+	{
+		// trigger
+	}
+	
+	@Override
 	protected void runImpl()
-    {
-        // TODO
-        _log.info("C5: RequestListPartyMatchingWaitingRoom");
-    }
-
-    /**
-     * @see com.l2jserver.gameserver.BasePacket#getType()
-     */
-    @Override
-    public String getType()
-    {
-        return _C__D0_16_REQUESTLISTPARTYMATCHINGWAITINGROOM;
-    }
-
-}
+	{
+		_log.info("C5: RequestListPartyMatchingWaitingRoom");
+	}
+	
+	@Override
+	public String getType()
+	{
+		return _C__D0_16_REQUESTLISTPARTYMATCHINGWAITINGROOM;
+	}
+	
+}

+ 4 - 6
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestOustFromPartyRoom.java

@@ -24,24 +24,22 @@ public final class RequestOustFromPartyRoom extends L2GameClientPacket
 	private static final String _C__D0_01_REQUESTOUSTFROMPARTYROOM = "[C] D0:01 RequestOustFromPartyRoom";
 	@SuppressWarnings("unused")
 	private int _id;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_id = readD();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
-		// TODO Auto-generated method stub
-
 	}
-
+	
 	@Override
 	public String getType()
 	{
 		return _C__D0_01_REQUESTOUSTFROMPARTYROOM;
 	}
-
+	
 }

+ 21 - 29
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPCCafeCouponUse.java

@@ -23,34 +23,26 @@ import java.util.logging.Logger;
  */
 public final class RequestPCCafeCouponUse extends L2GameClientPacket
 {
-    protected static final Logger _log = Logger.getLogger(RequestPCCafeCouponUse.class.getName());
-    private static final String _C__D0_20_REQUESTPCCAFECOUPONUSE = "[C] D0:?? RequestPCCafeCouponUse";
-    private String _str;
-
-
-    @Override
+	protected static final Logger _log = Logger.getLogger(RequestPCCafeCouponUse.class.getName());
+	private static final String _C__D0_20_REQUESTPCCAFECOUPONUSE = "[C] D0:?? RequestPCCafeCouponUse";
+	private String _str;
+	
+	@Override
 	protected void readImpl()
-    {
-        _str = readS();
-    }
-
-    /**
-     * @see com.l2jserver.util.network.BaseRecievePacket.ClientBasePacket#runImpl()
-     */
-    @Override
+	{
+		_str = readS();
+	}
+	
+	@Override
 	protected void runImpl()
-    {
-        // TODO
-        _log.info("C5: RequestPCCafeCouponUse: S: "+_str);
-    }
-
-    /**
-     * @see com.l2jserver.gameserver.BasePacket#getType()
-     */
-    @Override
-    public String getType()
-    {
-        return _C__D0_20_REQUESTPCCAFECOUPONUSE;
-    }
-
-}
+	{
+		_log.info("C5: RequestPCCafeCouponUse: S: " + _str);
+	}
+	
+	@Override
+	public String getType()
+	{
+		return _C__D0_20_REQUESTPCCAFECOUPONUSE;
+	}
+	
+}

+ 24 - 30
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeItemMakeSelf.java

@@ -19,52 +19,46 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
  * @author Administrator
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public final class RequestRecipeItemMakeSelf extends L2GameClientPacket
 {
-    private static final String _C__AF_REQUESTRECIPEITEMMAKESELF = "[C] AF RequestRecipeItemMakeSelf";
+	private static final String _C__AF_REQUESTRECIPEITEMMAKESELF = "[C] AF RequestRecipeItemMakeSelf";
 	//private static Logger _log = Logger.getLogger(RequestSellItem.class.getName());
-
+	
 	private int _id;
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_id = readD();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance activeChar = getClient().getActiveChar();
 		if (activeChar == null)
-		    return;
-
-        if (activeChar.getPrivateStoreType() != 0)
-        {
-            activeChar.sendMessage("Cannot make items while trading");
-            return;
-        }
-
-        if (activeChar.isInCraftMode())
-        {
-            activeChar.sendMessage("Currently in Craft Mode");
-            return;
-        }
-
+			return;
+		
+		if (activeChar.getPrivateStoreType() != 0)
+		{
+			activeChar.sendMessage("Cannot make items while trading");
+			return;
+		}
+		
+		if (activeChar.isInCraftMode())
+		{
+			activeChar.sendMessage("Currently in Craft Mode");
+			return;
+		}
+		
 		RecipeController.getInstance().requestMakeItem(activeChar, _id);
 	}
-
-    /* (non-Javadoc)
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-     */
-    @Override
+	
+	@Override
 	public String getType()
-    {
-        return _C__AF_REQUESTRECIPEITEMMAKESELF;
-    }
-
+	{
+		return _C__AF_REQUESTRECIPEITEMMAKESELF;
+	}
+	
 }

+ 34 - 41
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRecipeShopMakeItem.java

@@ -21,20 +21,17 @@ import com.l2jserver.gameserver.util.Util;
 
 /**
  * @author Administrator
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public final class RequestRecipeShopMakeItem extends L2GameClientPacket
 {
-    private static final String _C__AF_REQUESTRECIPESHOPMAKEITEM = "[C] B6 RequestRecipeShopMakeItem";
+	private static final String _C__AF_REQUESTRECIPESHOPMAKEITEM = "[C] B6 RequestRecipeShopMakeItem";
 	//private static Logger _log = Logger.getLogger(RequestSellItem.class.getName());
-
+	
 	private int _id;
 	private int _recipeId;
 	@SuppressWarnings("unused")
-    private long _unknow;
-
+	private long _unknow;
+	
 	@Override
 	protected void readImpl()
 	{
@@ -42,48 +39,44 @@ public final class RequestRecipeShopMakeItem extends L2GameClientPacket
 		_recipeId = readD();
 		_unknow = readQ();
 	}
-
+	
 	@Override
 	protected void runImpl()
 	{
 		L2PcInstance activeChar = getClient().getActiveChar();
 		if (activeChar == null)
-		    return;
-		L2PcInstance manufacturer = (L2PcInstance)L2World.getInstance().findObject(_id);
+			return;
+		L2PcInstance manufacturer = (L2PcInstance) L2World.getInstance().findObject(_id);
 		if (manufacturer == null)
-		    return;
-
-		if (manufacturer.getInstanceId() != activeChar.getInstanceId()
-				&& activeChar.getInstanceId() != -1)
 			return;
-
+		
+		if (manufacturer.getInstanceId() != activeChar.getInstanceId() && activeChar.getInstanceId() != -1)
+			return;
+		
 		if (activeChar.getPrivateStoreType() != 0)
-        {
-            activeChar.sendMessage("Cannot make items while trading");
-            return;
-        }
-        if (manufacturer.getPrivateStoreType() != 5)
-        {
-            //activeChar.sendMessage("Cannot make items while trading");
-            return;
-        }
-
-        if (activeChar.isInCraftMode() || manufacturer.isInCraftMode())
-        {
-            activeChar.sendMessage("Currently in Craft Mode");
-            return;
-        }
-        if (Util.checkIfInRange(150, activeChar, manufacturer, true))
-        	RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, activeChar);
+		{
+			activeChar.sendMessage("Cannot make items while trading");
+			return;
+		}
+		if (manufacturer.getPrivateStoreType() != 5)
+		{
+			//activeChar.sendMessage("Cannot make items while trading");
+			return;
+		}
+		
+		if (activeChar.isInCraftMode() || manufacturer.isInCraftMode())
+		{
+			activeChar.sendMessage("Currently in Craft Mode");
+			return;
+		}
+		if (Util.checkIfInRange(150, activeChar, manufacturer, true))
+			RecipeController.getInstance().requestManufactureItem(manufacturer, _recipeId, activeChar);
 	}
-
-    /* (non-Javadoc)
-     * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#getType()
-     */
-    @Override
+	
+	@Override
 	public String getType()
-    {
-        return _C__AF_REQUESTRECIPESHOPMAKEITEM;
-    }
-
+	{
+		return _C__AF_REQUESTRECIPESHOPMAKEITEM;
+	}
+	
 }

+ 5 - 13
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestWithdrawPartyRoom.java

@@ -27,33 +27,25 @@ public final class RequestWithdrawPartyRoom extends L2GameClientPacket
 	private static final String _C__D0_02_REQUESTWITHDRAWPARTYROOM = "[C] D0:02 RequestWithdrawPartyRoom";
 	private int _data1;
 	private int _data2;
-
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_data1 = readD();
 		_data2 = readD();
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
+	
 	@Override
 	protected void runImpl()
 	{
-		// TODO Auto-generated method stub
 		_log.info("This packet is not well known : RequestWithdrawPartyRoom");
-		_log.info("Data received: d:"+_data1+" d:"+_data2);
+		_log.info("Data received: d:" + _data1 + " d:" + _data2);
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{
 		return _C__D0_02_REQUESTWITHDRAWPARTYROOM;
 	}
-
+	
 }

+ 6 - 13
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestWriteHeroWords.java

@@ -13,6 +13,7 @@
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
 package com.l2jserver.gameserver.network.clientpackets;
+
 /**
  * Format chS
  * c (id) 0xD0
@@ -26,7 +27,7 @@ public final class RequestWriteHeroWords extends L2GameClientPacket
 	private static final String _C__FE_0C_REQUESTWRITEHEROWORDS = "[C] D0:0C RequestWriteHeroWords";
 	@SuppressWarnings("unused")
 	private String _heroWords;
-
+	
 	/**
 	 * @param buf
 	 * @param client
@@ -36,24 +37,16 @@ public final class RequestWriteHeroWords extends L2GameClientPacket
 	{
 		_heroWords = readS();
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
+	
 	@Override
 	protected void runImpl()
 	{
-		// TODO Auto-generated method stub
-
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{
 		return _C__FE_0C_REQUESTWRITEHEROWORDS;
 	}
-
-}
+	
+}

+ 5 - 14
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdCharacterInfo.java

@@ -27,31 +27,22 @@ public final class SuperCmdCharacterInfo extends L2GameClientPacket
 	private static final String _C__39_00_SUPERCMDCHARACTERINFO = "[C] 39:00 SuperCmdCharacterInfo";
 	@SuppressWarnings("unused")
 	private String _characterName;
-
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_characterName = readS();
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
+	
 	@Override
 	protected void runImpl()
 	{
-		// TODO Auto-generated method stub
-
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{
 		return _C__39_00_SUPERCMDCHARACTERINFO;
 	}
-
-}
+	
+}

+ 5 - 14
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdServerStatus.java

@@ -24,31 +24,22 @@ package com.l2jserver.gameserver.network.clientpackets;
 public final class SuperCmdServerStatus extends L2GameClientPacket
 {
 	private static final String _C__39_02_SUPERCMDSERVERSTATUS = "[C] 39:02 SuperCmdServerStatus";
-
-
+	
 	@Override
 	protected void readImpl()
 	{
 		// trigger packet
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
+	
 	@Override
 	protected void runImpl()
 	{
-		// TODO Auto-generated method stub
-
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{
 		return _C__39_02_SUPERCMDSERVERSTATUS;
 	}
-
-}
+	
+}

+ 6 - 16
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/SuperCmdSummonCmd.java

@@ -27,32 +27,22 @@ public class SuperCmdSummonCmd extends L2GameClientPacket
 	private static final String _C__39_01_SUPERCMDSUMMONCMD = "[C] 39:01 SuperCmdSummonCmd";
 	@SuppressWarnings("unused")
 	private String _summonName;
-
-
+	
 	@Override
 	protected void readImpl()
 	{
 		_summonName = readS();
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.clientpackets.ClientBasePacket#runImpl()
-	 */
+	
 	@Override
-	protected
-	void runImpl()
+	protected void runImpl()
 	{
-		// TODO Auto-generated method stub
-
 	}
-
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
+	
 	@Override
 	public String getType()
 	{
 		return _C__39_01_SUPERCMDSUMMONCMD;
 	}
-
-}
+	
+}

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/AdminForgePacket.java

@@ -71,7 +71,6 @@ public class AdminForgePacket extends L2GameServerPacket
 	 */
 	public boolean generate(byte b, String string)
 	{
-		// TODO Auto-generated method stub
 		if((b == 'C')||(b == 'c'))
 		{
 			writeC(Integer.decode(string));

+ 0 - 7
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/GetOffVehicle.java

@@ -51,9 +51,6 @@ public class GetOffVehicle extends L2GameServerPacket
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
-	 */
 	@Override
 	protected void writeImpl()
 	{
@@ -68,13 +65,9 @@ public class GetOffVehicle extends L2GameServerPacket
 
 	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		// TODO Auto-generated method stub
 		return "[S] 6f GetOffVehicle";
 	}
 

+ 0 - 9
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/SystemMessage.java

@@ -27,12 +27,6 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.templates.item.L2Item;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.18.2.5.2.8 $ $Date: 2005/04/05 19:41:08 $
- */
 public final class SystemMessage extends L2GameServerPacket
 {
 	// d d (d S/d d/d dd)
@@ -250,9 +244,6 @@ public final class SystemMessage extends L2GameServerPacket
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

+ 0 - 7
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/VehicleCheckLocation.java

@@ -41,9 +41,6 @@ public class VehicleCheckLocation extends L2GameServerPacket
 		_z = z;
 	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
-	 */
 	@Override
 	protected
 	void writeImpl()
@@ -56,13 +53,9 @@ public class VehicleCheckLocation extends L2GameServerPacket
 		writeD(_boat.getPosition().getHeading());
 	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 

+ 0 - 7
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/VehicleDeparture.java

@@ -47,9 +47,6 @@ public class VehicleDeparture extends L2GameServerPacket
 		_z = z;
 	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
-	 */
 	@Override
 	protected
 	void writeImpl()
@@ -64,13 +61,9 @@ public class VehicleDeparture extends L2GameServerPacket
 
 	}
 
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.BasePacket#getType()
-	 */
 	@Override
 	public String getType()
 	{
-		// TODO Auto-generated method stub
 		return "[S] 5A VehicleDeparture";
 	}
 

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/script/EngineInterface.java

@@ -33,9 +33,6 @@ import com.l2jserver.gameserver.model.L2World;
 
 /**
  * @author Luis Arias
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public interface EngineInterface
 {

+ 0 - 4
L2_GameServer/java/com/l2jserver/gameserver/script/ScriptEngine.java

@@ -18,12 +18,8 @@ import java.util.Hashtable;
 
 import com.l2jserver.gameserver.script.faenor.FaenorInterface;
 
-
 /**
  * @author Luis Arias
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ScriptEngine
 {

+ 5 - 6
L2_GameServer/java/com/l2jserver/gameserver/script/ScriptPackage.java

@@ -24,9 +24,6 @@ import javolution.util.FastList;
 
 /**
  * @author Luis Arias
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ScriptPackage
 {
@@ -68,11 +65,13 @@ public class ScriptPackage
             ZipEntry entry = e.nextElement();
             if (entry.getName().endsWith(".xml"))
             {
-                try {
+                try
+                {
                     ScriptDocument newScript = new ScriptDocument(entry.getName(), pack.getInputStream(entry));
                     _scriptFiles.add(newScript);
-                } catch (IOException e1) {
-                    // TODO Auto-generated catch block
+                }
+                catch (IOException e1)
+                {
                     e1.printStackTrace();
                 }
             }

+ 0 - 10
L2_GameServer/java/com/l2jserver/gameserver/script/faenor/FaenorInterface.java

@@ -36,9 +36,6 @@ import javolution.util.FastList;
 
 /**
  * @author Luis Arias
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class FaenorInterface implements EngineInterface
 {
@@ -53,12 +50,8 @@ public class FaenorInterface implements EngineInterface
 	{
 	}
 	
-	/* (non-Javadoc)
-	 * @see com.l2jserver.gameserver.script.EngineInterface#getAllPlayers()
-	 */
 	public List<?> getAllPlayers()
 	{
-		// TODO Auto-generated method stub
 		return null;
 	}
 	
@@ -150,9 +143,6 @@ public class FaenorInterface implements EngineInterface
 		npc.addDropData(drop, category);
 	}
 	
-	/**
-	 * @return Returns the _questDrops.
-	 */
 	public List<L2DropData> getQuestDrops(int npcID)
 	{
 		L2NpcTemplate npc = npcTable.getTemplate(npcID);

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/DocumentBase.java

@@ -55,9 +55,6 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 abstract class DocumentBase
 {

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/DocumentItem.java

@@ -37,9 +37,6 @@ import com.l2jserver.gameserver.templates.item.L2WeaponType;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 final class DocumentItem extends DocumentBase
 {

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/SkillsEngine.java

@@ -35,9 +35,6 @@ import javolution.util.FastList;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class SkillsEngine
 {

+ 7 - 11
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerHp.java

@@ -16,25 +16,21 @@ package com.l2jserver.gameserver.skills.conditions;
 
 import com.l2jserver.gameserver.skills.Env;
 
-
-
 /**
  * @author mr
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionPlayerHp extends Condition {
-
+public class ConditionPlayerHp extends Condition
+{
 	private final int _hp;
-
+	
 	public ConditionPlayerHp(int hp)
 	{
 		_hp = hp;
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
-		return env.player.getCurrentHp()*100/env.player.getMaxHp() <= _hp;
+	public boolean testImpl(Env env)
+	{
+		return env.player.getCurrentHp() * 100 / env.player.getMaxHp() <= _hp;
 	}
 }

+ 6 - 10
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerLevel.java

@@ -16,25 +16,21 @@ package com.l2jserver.gameserver.skills.conditions;
 
 import com.l2jserver.gameserver.skills.Env;
 
-
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionPlayerLevel extends Condition {
-
+public class ConditionPlayerLevel extends Condition
+{
 	private final int _level;
-
+	
 	public ConditionPlayerLevel(int level)
 	{
 		_level = level;
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
+	public boolean testImpl(Env env)
+	{
 		return env.player.getLevel() >= _level;
 	}
 }

+ 8 - 10
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerRace.java

@@ -18,26 +18,24 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.Race;
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionPlayerRace extends Condition {
-
+public class ConditionPlayerRace extends Condition
+{
+	
 	private final Race _race;
-
+	
 	public ConditionPlayerRace(Race race)
 	{
 		_race = race;
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
+	public boolean testImpl(Env env)
+	{
 		if (!(env.player instanceof L2PcInstance))
 			return false;
-		return ((L2PcInstance)env.player).getRace() == _race;
+		return ((L2PcInstance) env.player).getRace() == _race;
 	}
 }

+ 30 - 34
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionPlayerState.java

@@ -18,56 +18,52 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.PlayerState;
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionPlayerState extends Condition 
+public class ConditionPlayerState extends Condition
 {
-
+	
 	private final PlayerState _check;
 	private final boolean _required;
-
+	
 	public ConditionPlayerState(PlayerState check, boolean required)
 	{
 		_check = check;
 		_required = required;
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
+	public boolean testImpl(Env env)
+	{
 		L2PcInstance player;
 		switch (_check)
 		{
-		case RESTING:
-			if (env.player instanceof L2PcInstance)
-				return ((L2PcInstance)env.player).isSitting() == _required;
-			return !_required;
-		case MOVING:
-			return env.player.isMoving() == _required;
-		case RUNNING:
-			return env.player.isMoving() == _required && env.player.isRunning() == _required;
-		case FLYING:
-			return env.player.isFlying() == _required;
-        case BEHIND:
-            return env.player.isBehindTarget() == _required;
-        case FRONT:
-            return env.player.isInFrontOfTarget() == _required;
-        case CHAOTIC:
-        	player = env.player.getActingPlayer();
-        	if (player != null) 
-        		return  player.getKarma() > 0 == _required;
-			return !_required;
-        case OLYMPIAD:
-        	player = env.player.getActingPlayer();
-        	if (player != null)
-        		return player.isInOlympiadMode() == _required;
-        	return !_required;
+			case RESTING:
+				if (env.player instanceof L2PcInstance)
+					return ((L2PcInstance) env.player).isSitting() == _required;
+				return !_required;
+			case MOVING:
+				return env.player.isMoving() == _required;
+			case RUNNING:
+				return env.player.isMoving() == _required && env.player.isRunning() == _required;
+			case FLYING:
+				return env.player.isFlying() == _required;
+			case BEHIND:
+				return env.player.isBehindTarget() == _required;
+			case FRONT:
+				return env.player.isInFrontOfTarget() == _required;
+			case CHAOTIC:
+				player = env.player.getActingPlayer();
+				if (player != null)
+					return player.getKarma() > 0 == _required;
+				return !_required;
+			case OLYMPIAD:
+				player = env.player.getActingPlayer();
+				if (player != null)
+					return player.isInOlympiadMode() == _required;
+				return !_required;
 		}
 		return !_required;
 	}
 }
-

+ 7 - 11
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionSkillStats.java

@@ -17,29 +17,25 @@ package com.l2jserver.gameserver.skills.conditions;
 import com.l2jserver.gameserver.skills.Env;
 import com.l2jserver.gameserver.skills.Stats;
 
-
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionSkillStats extends Condition {
-
+public class ConditionSkillStats extends Condition
+{
+	
 	private final Stats _stat;
-
+	
 	public ConditionSkillStats(Stats stat)
 	{
 		super();
 		_stat = stat;
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
+	public boolean testImpl(Env env)
+	{
 		if (env.skill == null)
 			return false;
 		return env.skill.getStat() == _stat;
 	}
 }
-

+ 6 - 9
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionSlotItemId.java

@@ -19,31 +19,28 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class ConditionSlotItemId extends ConditionInventory {
-
+public final class ConditionSlotItemId extends ConditionInventory
+{
+	
 	private final int _itemId;
 	private final int _enchantLevel;
-
+	
 	public ConditionSlotItemId(int slot, int itemId, int enchantLevel)
 	{
 		super(slot);
 		_itemId = itemId;
 		_enchantLevel = enchantLevel;
 	}
-
+	
 	@Override
 	public boolean testImpl(Env env)
 	{
 		if (!(env.player instanceof L2PcInstance))
 			return false;
-		Inventory inv = ((L2PcInstance)env.player).getInventory();
+		Inventory inv = ((L2PcInstance) env.player).getInventory();
 		L2ItemInstance item = inv.getPaperdollItem(_slot);
 		if (item == null)
 			return _itemId == 0;

+ 6 - 8
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionSlotItemType.java

@@ -21,26 +21,24 @@ import com.l2jserver.gameserver.skills.Env;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class ConditionSlotItemType extends ConditionInventory {
-
+public final class ConditionSlotItemType extends ConditionInventory
+{
+	
 	private final int _mask;
-
+	
 	public ConditionSlotItemType(int slot, int mask)
 	{
 		super(slot);
 		_mask = mask;
 	}
-
+	
 	@Override
 	public boolean testImpl(Env env)
 	{
 		if (!(env.player instanceof L2PcInstance))
 			return false;
-		Inventory inv = ((L2PcInstance)env.player).getInventory();
+		Inventory inv = ((L2PcInstance) env.player).getInventory();
 		L2ItemInstance item = inv.getPaperdollItem(_slot);
 		if (item == null)
 			return false;

+ 9 - 11
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetAggro.java

@@ -19,32 +19,30 @@ import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionTargetAggro extends Condition {
-
+public class ConditionTargetAggro extends Condition
+{
+	
 	private final boolean _isAggro;
-
+	
 	public ConditionTargetAggro(boolean isAggro)
 	{
 		_isAggro = isAggro;
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
+	public boolean testImpl(Env env)
+	{
 		L2Character target = env.target;
 		if (target instanceof L2MonsterInstance)
 		{
-			return ((L2MonsterInstance)target).isAggressive() == _isAggro;
+			return ((L2MonsterInstance) target).isAggressive() == _isAggro;
 		}
 		if (target instanceof L2PcInstance)
 		{
-			return ((L2PcInstance)target).getKarma() > 0;
+			return ((L2PcInstance) target).getKarma() > 0;
 		}
 		return false;
 	}

+ 31 - 33
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetBodyPart.java

@@ -21,41 +21,39 @@ import com.l2jserver.gameserver.templates.item.L2Item;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ConditionTargetBodyPart extends Condition
 {
-
-    private L2Armor _armor;
-
-    public ConditionTargetBodyPart(L2Armor armor)
-    {
-        _armor = armor;
-    }
-
-    @Override
+	
+	private L2Armor _armor;
+	
+	public ConditionTargetBodyPart(L2Armor armor)
+	{
+		_armor = armor;
+	}
+	
+	@Override
 	public boolean testImpl(Env env)
-    {
-        // target is attacker
-        if (env.target == null) return true;
-        int bodypart = env.target.getAttackingBodyPart();
-        int armor_part = _armor.getBodyPart();
-        switch (bodypart)
-        {
-            case Inventory.PAPERDOLL_CHEST:
-                return (armor_part & (L2Item.SLOT_CHEST | L2Item.SLOT_FULL_ARMOR | L2Item.SLOT_UNDERWEAR)) != 0;
-            case Inventory.PAPERDOLL_LEGS:
-                return (armor_part & (L2Item.SLOT_LEGS | L2Item.SLOT_FULL_ARMOR)) != 0;
-            case Inventory.PAPERDOLL_HEAD:
-                return (armor_part & L2Item.SLOT_HEAD) != 0;
-            case Inventory.PAPERDOLL_FEET:
-                return (armor_part & L2Item.SLOT_FEET) != 0;
-            case Inventory.PAPERDOLL_GLOVES:
-                return (armor_part & L2Item.SLOT_GLOVES) != 0;
-            default:
-                return true;
-        }
-    }
+	{
+		// target is attacker
+		if (env.target == null)
+			return true;
+		int bodypart = env.target.getAttackingBodyPart();
+		int armor_part = _armor.getBodyPart();
+		switch (bodypart)
+		{
+			case Inventory.PAPERDOLL_CHEST:
+				return (armor_part & (L2Item.SLOT_CHEST | L2Item.SLOT_FULL_ARMOR | L2Item.SLOT_UNDERWEAR)) != 0;
+			case Inventory.PAPERDOLL_LEGS:
+				return (armor_part & (L2Item.SLOT_LEGS | L2Item.SLOT_FULL_ARMOR)) != 0;
+			case Inventory.PAPERDOLL_HEAD:
+				return (armor_part & L2Item.SLOT_HEAD) != 0;
+			case Inventory.PAPERDOLL_FEET:
+				return (armor_part & L2Item.SLOT_FEET) != 0;
+			case Inventory.PAPERDOLL_GLOVES:
+				return (armor_part & L2Item.SLOT_GLOVES) != 0;
+			default:
+				return true;
+		}
+	}
 }

+ 7 - 9
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetLevel.java

@@ -16,24 +16,22 @@ package com.l2jserver.gameserver.skills.conditions;
 
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionTargetLevel extends Condition {
-
+public class ConditionTargetLevel extends Condition
+{
+	
 	private final int _level;
-
+	
 	public ConditionTargetLevel(int level)
 	{
 		_level = level;
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
+	public boolean testImpl(Env env)
+	{
 		if (env.target == null)
 			return false;
 		return env.target.getLevel() >= _level;

+ 6 - 8
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetNone.java

@@ -16,21 +16,19 @@ package com.l2jserver.gameserver.skills.conditions;
 
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionTargetNone extends Condition {
-
+public class ConditionTargetNone extends Condition
+{
+	
 	public ConditionTargetNone()
 	{
 	}
-
+	
 	@Override
-	public boolean testImpl(Env env) {
+	public boolean testImpl(Env env)
+	{
 		return (env.target == null);
 	}
 }

+ 18 - 20
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetRace.java

@@ -18,26 +18,24 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.base.Race;
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public class ConditionTargetRace extends Condition {
-
-   private final Race _race;
-
-   public ConditionTargetRace(Race race)
-   {
-       _race = race;
-   }
-
-   @Override
-   public boolean testImpl(Env env) {
-       if (!(env.target instanceof L2PcInstance))
-           return false;
-       return ((L2PcInstance)env.target).getRace() == _race;
-   }
-}
+public class ConditionTargetRace extends Condition
+{
+	
+	private final Race _race;
+	
+	public ConditionTargetRace(Race race)
+	{
+		_race = race;
+	}
+	
+	@Override
+	public boolean testImpl(Env env)
+	{
+		if (!(env.target instanceof L2PcInstance))
+			return false;
+		return ((L2PcInstance) env.target).getRace() == _race;
+	}
+}

+ 8 - 12
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionTargetUsesWeaponKind.java

@@ -17,35 +17,31 @@ package com.l2jserver.gameserver.skills.conditions;
 import com.l2jserver.gameserver.skills.Env;
 import com.l2jserver.gameserver.templates.item.L2Weapon;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class ConditionTargetUsesWeaponKind extends Condition
 {
-
+	
 	private final int _weaponMask;
-
+	
 	public ConditionTargetUsesWeaponKind(int weaponMask)
 	{
 		_weaponMask = weaponMask;
 	}
-
+	
 	@Override
 	public boolean testImpl(Env env)
 	{
-
+		
 		if (env.target == null)
 			return false;
-
+		
 		L2Weapon item = env.target.getActiveWeaponItem();
-
-		if(item == null)
+		
+		if (item == null)
 			return false;
-
+		
 		return (item.getItemType().mask() & _weaponMask) != 0;
 	}
 }

+ 18 - 16
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionUsingItemType.java

@@ -23,48 +23,50 @@ import com.l2jserver.gameserver.templates.item.L2Item;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class ConditionUsingItemType extends Condition {
-
+public final class ConditionUsingItemType extends Condition
+{
 	private final int _mask;
-
+	
 	public ConditionUsingItemType(int mask)
 	{
 		_mask = mask;
 	}
-
+	
 	@Override
 	public boolean testImpl(Env env)
 	{
 		if (!(env.player instanceof L2PcInstance))
 			return false;
-		Inventory inv = ((L2PcInstance)env.player).getInventory();
+		Inventory inv = ((L2PcInstance) env.player).getInventory();
 		
 		//If ConditionUsingItemType is one between Light, Heavy or Magic
-		if ( _mask == L2ArmorType.LIGHT.mask() || _mask == L2ArmorType.HEAVY.mask() || _mask == L2ArmorType.MAGIC.mask() )
+		if (_mask == L2ArmorType.LIGHT.mask() || _mask == L2ArmorType.HEAVY.mask() || _mask == L2ArmorType.MAGIC.mask())
 		{
 			//Get the itemMask of the weared chest (if exists)
 			L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
-			if (chest == null) return false;
+			if (chest == null)
+				return false;
 			int chestMask = chest.getItem().getItemMask();
-		
+			
 			//If chest armor is different from the condition one return false
-			if ( (_mask & chestMask) == 0) return false;
+			if ((_mask & chestMask) == 0)
+				return false;
 			
 			//So from here, chest armor matches conditions
 			
 			int chestBodyPart = chest.getItem().getBodyPart();
 			//return True if chest armor is a Full Armor
-			if (chestBodyPart == L2Item.SLOT_FULL_ARMOR) return true; 
-			else { //check legs 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;
+				if (legs == null)
+					return false;
 				int legMask = legs.getItem().getItemMask();
 				//return true if legs armor matches too
-				return (_mask & legMask) != 0;	
+				return (_mask & legMask) != 0;
 			}
 		}
 		return (_mask & inv.getWearedMask()) != 0;

+ 4 - 8
L2_GameServer/java/com/l2jserver/gameserver/skills/conditions/ConditionUsingSkill.java

@@ -16,22 +16,18 @@ package com.l2jserver.gameserver.skills.conditions;
 
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class ConditionUsingSkill extends Condition {
-
+public final class ConditionUsingSkill extends Condition
+{
 	private final int _skillId;
-
+	
 	public ConditionUsingSkill(int skillId)
 	{
 		_skillId = skillId;
 	}
-
+	
 	@Override
 	public boolean testImpl(Env env)
 	{

+ 0 - 11
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectBuff.java

@@ -21,9 +21,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author mkizub
- * 
- *         TODO To change the template for this generated type comment go to
- *         Window - Preferences - Java - Code Style - Code Templates
  */
 public class EffectBuff extends L2Effect
 {
@@ -38,20 +35,12 @@ public class EffectBuff extends L2Effect
 		super(env, effect);
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
-	 */
 	@Override
 	public L2EffectType getEffectType()
 	{
 		return L2EffectType.BUFF;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
-	 */
 	@Override
 	public boolean onActionTime()
 	{

+ 0 - 12
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectEnemyCharge.java

@@ -38,20 +38,12 @@ public class EffectEnemyCharge extends L2Effect
 		super(env, template);
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
-	 */
 	@Override
 	public L2EffectType getEffectType()
 	{
 		return L2EffectType.BUFF;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
-	 */
 	@Override
 	public boolean onStart()
 	{
@@ -109,10 +101,6 @@ public class EffectEnemyCharge extends L2Effect
 		return true;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
-	 */
 	@Override
 	public boolean onActionTime()
 	{

+ 0 - 16
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectGrow.java

@@ -28,20 +28,12 @@ public class EffectGrow extends L2Effect
 		super(env, template);
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
-	 */
 	@Override
 	public L2EffectType getEffectType()
 	{
 		return L2EffectType.BUFF;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
-	 */
 	@Override
 	public boolean onStart()
 	{
@@ -58,20 +50,12 @@ public class EffectGrow extends L2Effect
 		return false;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
-	 */
 	@Override
 	public boolean onActionTime()
 	{
 		return false;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
-	 */
 	@Override
 	public void onExit()
 	{

+ 0 - 19
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectImmobilePetBuff.java

@@ -23,9 +23,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author demonia
- * 
- *         TODO To change the template for this generated type comment go to
- *         Window - Preferences - Java - Code Style - Code Templates
  */
 public class EffectImmobilePetBuff extends L2Effect
 {
@@ -36,20 +33,12 @@ public class EffectImmobilePetBuff extends L2Effect
 		super(env, template);
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
-	 */
 	@Override
 	public L2EffectType getEffectType()
 	{
 		return L2EffectType.BUFF;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
-	 */
 	@Override
 	public boolean onStart()
 	{
@@ -66,20 +55,12 @@ public class EffectImmobilePetBuff extends L2Effect
 		return false;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
-	 */
 	@Override
 	public void onExit()
 	{
 		_pet.setIsImmobilized(false);
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
-	 */
 	@Override
 	public boolean onActionTime()
 	{

+ 0 - 19
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectRoot.java

@@ -21,9 +21,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author mkizub
- * 
- *         TODO To change the template for this generated type comment go to
- *         Window - Preferences - Java - Code Style - Code Templates
  */
 public class EffectRoot extends L2Effect
 {
@@ -32,20 +29,12 @@ public class EffectRoot extends L2Effect
 		super(env, template);
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#getEffectType()
-	 */
 	@Override
 	public L2EffectType getEffectType()
 	{
 		return L2EffectType.ROOT;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onStart()
-	 */
 	@Override
 	public boolean onStart()
 	{
@@ -53,20 +42,12 @@ public class EffectRoot extends L2Effect
 		return true;
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onExit()
-	 */
 	@Override
 	public void onExit()
 	{
 		getEffected().stopRooting(this);
 	}
 	
-	/**
-	 * 
-	 * @see com.l2jserver.gameserver.model.L2Effect#onActionTime()
-	 */
 	@Override
 	public boolean onActionTime()
 	{

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/skills/effects/EffectStun.java

@@ -21,9 +21,6 @@ import com.l2jserver.gameserver.templates.skills.L2EffectType;
 
 /**
  * @author mkizub
- * 
- *         TODO To change the template for this generated type comment go to
- *         Window - Preferences - Java - Code Style - Code Templates
  */
 public class EffectStun extends L2Effect
 {

+ 30 - 20
L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/FuncTemplate.java

@@ -21,15 +21,11 @@ import com.l2jserver.gameserver.skills.Env;
 import com.l2jserver.gameserver.skills.Stats;
 import com.l2jserver.gameserver.skills.conditions.Condition;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class FuncTemplate {
-
+public final class FuncTemplate
+{
 	public Condition attachCond;
 	public Condition applayCond;
 	public final Class<?> func;
@@ -37,7 +33,7 @@ public final class FuncTemplate {
 	public final Stats stat;
 	public final int order;
 	public final Lambda lambda;
-
+	
 	public FuncTemplate(Condition pAttachCond, Condition pApplayCond, String pFunc, Stats pStat, int pOrder, Lambda pLambda)
 	{
 		attachCond = pAttachCond;
@@ -45,43 +41,57 @@ public final class FuncTemplate {
 		stat = pStat;
 		order = pOrder;
 		lambda = pLambda;
-		try {
-			func = Class.forName("com.l2jserver.gameserver.skills.funcs.Func"+pFunc);
-		} catch (ClassNotFoundException e) {
+		try
+		{
+			func = Class.forName("com.l2jserver.gameserver.skills.funcs.Func" + pFunc);
+		}
+		catch (ClassNotFoundException e)
+		{
 			throw new RuntimeException(e);
 		}
-		try {
+		try
+		{
 			constructor = func.getConstructor(
-				new Class[]{
+				new Class[]
+				{
 						Stats.class, // stats to update
 						Integer.TYPE, // order of execution
 						Object.class, // owner
 						Lambda.class // value for function
 				});
-		} catch (NoSuchMethodException e) {
+		}
+		catch (NoSuchMethodException e)
+		{
 			throw new RuntimeException(e);
 		}
 	}
-
+	
 	public Func getFunc(Env env, Object owner)
 	{
 		if (attachCond != null && !attachCond.test(env))
 			return null;
-		try {
-			Func f = (Func)constructor.newInstance(stat, order, owner, lambda);
+		try
+		{
+			Func f = (Func) constructor.newInstance(stat, order, owner, lambda);
 			if (applayCond != null)
 				f.setCondition(applayCond);
 			return f;
-		} catch (IllegalAccessException e) {
+		}
+		catch (IllegalAccessException e)
+		{
 			e.printStackTrace();
 			return null;
-		} catch (InstantiationException e) {
+		}
+		catch (InstantiationException e)
+		{
 			e.printStackTrace();
 			return null;
-		} catch (InvocationTargetException e) {
+		}
+		catch (InvocationTargetException e)
+		{
 			e.printStackTrace();
 			return null;
 		}
-
+		
 	}
 }

+ 2 - 4
L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/Lambda.java

@@ -18,10 +18,8 @@ import com.l2jserver.gameserver.skills.Env;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public abstract class Lambda {
+public abstract class Lambda
+{
 	public abstract double calc(Env env);
 }

+ 2 - 4
L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaCalc.java

@@ -18,11 +18,9 @@ import com.l2jserver.gameserver.skills.Env;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class LambdaCalc extends Lambda {
+public final class LambdaCalc extends Lambda
+{
 
 	public Func[] funcs;
 	public LambdaCalc()

+ 2 - 4
L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaConst.java

@@ -18,11 +18,9 @@ import com.l2jserver.gameserver.skills.Env;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class LambdaConst extends Lambda {
+public final class LambdaConst extends Lambda
+{
 
 	private final double _value;
 	public LambdaConst(double value)

+ 2 - 4
L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaRnd.java

@@ -19,11 +19,9 @@ import com.l2jserver.util.Rnd;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class LambdaRnd extends Lambda {
+public final class LambdaRnd extends Lambda
+{
 
 	private final Lambda _max;
 	private final boolean _linear;

+ 2 - 5
L2_GameServer/java/com/l2jserver/gameserver/skills/funcs/LambdaStats.java

@@ -16,14 +16,11 @@ package com.l2jserver.gameserver.skills.funcs;
 
 import com.l2jserver.gameserver.skills.Env;
 
-
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
-public final class LambdaStats extends Lambda {
+public final class LambdaStats extends Lambda
+{
 
 	public enum StatsType
 	{

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillChargeDmg.java

@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.skills.Formulas;
 import com.l2jserver.gameserver.templates.StatsSet;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
 
-
 public class L2SkillChargeDmg extends L2Skill
 {
 	private static final Logger _logDamage = Logger.getLogger("damage");

+ 0 - 12
L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSummon.java

@@ -243,25 +243,16 @@ public class L2SkillSummon extends L2Skill
 		return _isCubic;
 	}
 
-	/**
-	 * @return Returns the itemConsume count over time.
-	 */
 	public final int getTotalLifeTime()
 	{
 		return _summonTotalLifeTime;
 	}
 
-	/**
-	 * @return Returns the itemConsume count over time.
-	 */
 	public final int getTimeLostIdle()
 	{
 		return _summonTimeLostIdle;
 	}
 
-	/**
-	 * @return Returns the itemConsumeId over time.
-	 */
 	public final int getTimeLostActive()
 	{
 		return _summonTimeLostActive;
@@ -283,9 +274,6 @@ public class L2SkillSummon extends L2Skill
 		return _itemConsumeIdOT;
 	}
 
-	/**
-	 * @return Returns the itemConsume count over time.
-	 */
 	public final int getItemConsumeSteps()
 	{
 		return _itemConsumeSteps;

+ 0 - 1
L2_GameServer/java/com/l2jserver/gameserver/skills/l2skills/L2SkillTeleport.java

@@ -30,7 +30,6 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.StatsSet;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
 
-
 public class L2SkillTeleport extends L2Skill
 {
 	private final String _recallType;

+ 0 - 3
L2_GameServer/java/com/l2jserver/gameserver/templates/chars/L2PcTemplate.java

@@ -24,9 +24,6 @@ import javolution.util.FastList;
 
 /**
  * @author mkizub
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
  */
 public class L2PcTemplate extends L2CharTemplate
 {

+ 0 - 2
L2_GameServer/java/com/l2jserver/gsregistering/BaseGameServerRegister.java

@@ -38,9 +38,7 @@ import com.l2jserver.i18n.LanguageControl;
 import com.l2jserver.loginserver.GameServerTable;
 import com.l2jserver.util.Util;
 
-
 /**
- *
  * @author KenM
  */
 public abstract class BaseGameServerRegister

+ 0 - 1
L2_GameServer/java/com/l2jserver/loginserver/FloodProtectedListener.java

@@ -158,7 +158,6 @@ public abstract class FloodProtectedListener extends Thread
 		}
 		catch (IOException e)
 		{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}

+ 0 - 5
L2_GameServer/java/com/l2jserver/loginserver/GameServerThread.java

@@ -486,10 +486,6 @@ public class GameServerThread extends Thread
 		}
 	}
 
-	/**
-	 *
-	 * @param gameServerauth
-	 */
 	/*private void handleRegisterationProcess(GameServerAuth gameServerauth)
 	{
 		try
@@ -593,7 +589,6 @@ public class GameServerThread extends Thread
 	 */
 	public static boolean isBannedGameserverIP(String ipAddress)
 	{
-		// TODO Auto-generated method stub
 		return false;
 	}
 

+ 0 - 1
L2_GameServer/java/com/l2jserver/loginserver/L2LoginServer.java

@@ -84,7 +84,6 @@ public class L2LoginServer
 		}
 		catch (IOException e)
 		{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		finally

+ 0 - 1
L2_GameServer/java/com/l2jserver/util/network/BaseSendablePacket.java

@@ -89,7 +89,6 @@ public abstract class BaseSendablePacket
 		}
 		catch (IOException e)
 		{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 	}

+ 10 - 3
L2_GameServer/java/config/loginserver.properties

@@ -105,11 +105,11 @@ Driver = com.mysql.jdbc.Driver
 # URL = jdbc:mysql://localhost/l2jdb (default)
 # URL = jdbc:hsqldb:hsql://localhost/l2jdb
 # URL = jdbc:sqlserver://localhost/database = l2jdb/user = sa/password = 
-URL = jdbc:mysql://localhost/l2jdb
+URL = jdbc:mysql://localhost/l2jdbe
 # Database user info (default is "root" but it's not recommended)
 Login = root
 # Database connection password
-Password = 
+Password = puka
 
 # Default: 10
 MaximumDbConnections = 10
@@ -125,6 +125,7 @@ MaximumDbIdleTime = 0
 # Default: True
 ShowLicence = True
 
+# Create a new game account on player login if the account name does not exist yet.
 # Default: True
 AutoCreateAccounts = True
 
@@ -139,4 +140,10 @@ Debug = False
 Assert = False
 
 # Default: False
-Developer = False
+Developer = False
+
+# An option that provides basic [OOG] client emulator protection (no client modding needed)
+# After logging in, a user must input any text inside a dialog to continue.
+UseSecurityCardToLogin = True
+# Input verification is not done.
+# SecurityCardID = l2jserver

+ 3 - 3
L2_GameServer/java/config/server.properties

@@ -18,7 +18,7 @@
 # If this IP is resolvable by the Login Server, just leave *.
 # ---------------------------------------------------------------------------
 # Default: *
-ExternalHostname = *
+ExternalHostname = 127.0.0.1
 
 # ---------------------------------------------------------------------------
 # This is transmitted to the client from the same network, so it has to be a local IP or resolvable hostname.
@@ -56,11 +56,11 @@ Driver = com.mysql.jdbc.Driver
 # URL = jdbc:mysql://localhost/l2jdb (default)
 # URL = jdbc:hsqldb:hsql://localhost/l2jdb
 # URL = jdbc:sqlserver://localhost/database = l2jdb/user = sa/password = 
-URL = jdbc:mysql://localhost/l2jdb
+URL = jdbc:mysql://localhost/l2jdbe
 # Database user info (default is "root" but it's not recommended)
 Login = root
 # Database connection password
-Password = 
+Password = puka
 
 # Default: 100
 MaximumDbConnections = 100

+ 0 - 1
L2_GameServer/javaTest/com/l2jserver/gameserver/idfactory/IDFactoryTest.java

@@ -131,7 +131,6 @@ public class IDFactoryTest extends TestCase
 		}
 		catch (InterruptedException e)
 		{
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
 		System.out.println("Free ID's: "+_idFactory.size());