BETA: !ServerPackets rework dropping getType method since is completely useless using getClass().getSimpleName() instead.

	* Formatted all packets
	* Cleaned all crappy comments
	* Added a lot of TODO/FIXME/XXX comments
	* Trigger packets cached to static variable STATIC_PACKET (As ActionFailed?)
	* Upper-case hexadecimal letters (Such as 0xFE)
	* Added missing public/private/protected final declarations
	* And god knows what more..

L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -1152,7 +1152,7 @@ public final class Config
 				PET_NAME_TEMPLATE = serverSettings.getProperty("PetNameTemplate", ".*");
 				CLAN_NAME_TEMPLATE = serverSettings.getProperty("ClanNameTemplate", ".*");
 				
-				MAX_CHARACTERS_NUMBER_PER_ACCOUNT = Integer.parseInt(serverSettings.getProperty("CharMaxNumber", "0"));
+				MAX_CHARACTERS_NUMBER_PER_ACCOUNT = Integer.parseInt(serverSettings.getProperty("CharMaxNumber", "7"));
 				MAXIMUM_ONLINE_USERS = Integer.parseInt(serverSettings.getProperty("MaximumOnlineUsers", "100"));
 				
 				String[] protocols = serverSettings.getProperty("AllowedProtocolRevisions", "267;268;271;273").split(";");

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

@@ -46,8 +46,8 @@ public final class PetitionManager
 {
 	protected static final Logger _log = Logger.getLogger(PetitionManager.class.getName());
 	
-	private Map<Integer, Petition> _pendingPetitions;
-	private Map<Integer, Petition> _completedPetitions;
+	private final Map<Integer, Petition> _pendingPetitions;
+	private final Map<Integer, Petition> _completedPetitions;
 	
 	private static enum PetitionState
 	{
@@ -82,16 +82,16 @@ public final class PetitionManager
 	
 	private class Petition
 	{
-		private long _submitTime = System.currentTimeMillis();
+		private final long _submitTime = System.currentTimeMillis();
 		
-		private int _id;
-		private PetitionType _type;
+		private final int _id;
+		private final PetitionType _type;
 		private PetitionState _state = PetitionState.Pending;
-		private String _content;
+		private final String _content;
 		
-		private List<CreatureSay> _messageLog = new FastList<>();
+		private final List<CreatureSay> _messageLog = new FastList<>();
 		
-		private L2PcInstance _petitioner;
+		private final L2PcInstance _petitioner;
 		private L2PcInstance _responder;
 		
 		public Petition(L2PcInstance petitioner, String petitionText, int petitionType)
@@ -149,7 +149,7 @@ public final class PetitionManager
 			if (getPetitioner() != null && getPetitioner().isOnline())
 			{
 				getPetitioner().sendPacket(SystemMessageId.THIS_END_THE_PETITION_PLEASE_PROVIDE_FEEDBACK);
-				getPetitioner().sendPacket(new PetitionVotePacket());
+				getPetitioner().sendPacket(PetitionVotePacket.STATIC_PACKET);
 			}
 			
 			getCompletedPetitions().put(getId(), this);

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

@@ -512,7 +512,7 @@ public class L2Clan
 			player.setPledgeClass(exMember.calculatePledgeClass(player));
 			player.broadcastUserInfo();
 			// disable clan tab
-			player.sendPacket(new PledgeShowMemberListDeleteAll());
+			player.sendPacket(PledgeShowMemberListDeleteAll.STATIC_PACKET);
 		}
 		else
 		{
@@ -1556,7 +1556,7 @@ public class L2Clan
 	{
 		for (L2PcInstance member : getOnlineMembers(0))
 		{
-			member.sendPacket(new PledgeShowMemberListDeleteAll());
+			member.sendPacket(PledgeShowMemberListDeleteAll.STATIC_PACKET);
 			member.sendPacket(new PledgeShowMemberListAll(this, member));
 		}
 	}

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

@@ -50,7 +50,7 @@ public class L2CommandChannel extends AbstractPlayerGroup
 		_channelLvl = leader.getParty().getLevel();
 		leader.getParty().setCommandChannel(this);
 		leader.getParty().broadcastMessage(SystemMessageId.COMMAND_CHANNEL_FORMED);
-		leader.getParty().broadcastPacket(new ExOpenMPCC());
+		leader.getParty().broadcastPacket(ExOpenMPCC.STATIC_PACKET);
 	}
 	
 	/**
@@ -73,7 +73,7 @@ public class L2CommandChannel extends AbstractPlayerGroup
 		}
 		party.setCommandChannel(this);
 		party.broadcastPacket(SystemMessage.getSystemMessage(SystemMessageId.JOINED_COMMAND_CHANNEL));
-		party.broadcastPacket(new ExOpenMPCC());
+		party.broadcastPacket(ExOpenMPCC.STATIC_PACKET);
 	}
 	
 	/**

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

@@ -298,7 +298,7 @@ public class L2Party extends AbstractPlayerGroup
 		{
 			if (member != null)
 			{
-				member.sendPacket(new PartySmallWindowDeleteAll());
+				member.sendPacket(PartySmallWindowDeleteAll.STATIC_PACKET);
 				member.sendPacket(new PartySmallWindowAll(member, this));
 				member.broadcastUserInfo();
 			}
@@ -406,7 +406,7 @@ public class L2Party extends AbstractPlayerGroup
 		// open the CCInformationwindow
 		if (isInCommandChannel())
 		{
-			player.sendPacket(new ExOpenMPCC());
+			player.sendPacket(ExOpenMPCC.STATIC_PACKET);
 		}
 		
 		if (_positionBroadcastTask == null)
@@ -494,7 +494,7 @@ public class L2Party extends AbstractPlayerGroup
 			}
 			
 			// UI update.
-			player.sendPacket(new PartySmallWindowDeleteAll());
+			player.sendPacket(PartySmallWindowDeleteAll.STATIC_PACKET);
 			player.setParty(null);
 			broadcastPacket(new PartySmallWindowDelete(player));
 			final L2Summon summon = player.getPet();

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

@@ -145,7 +145,7 @@ public final class L2ClassMasterInstance extends L2MerchantInstance
 		catch (NumberFormatException e)
 		{
 		}
-		player.sendPacket(new TutorialCloseHtml());
+		player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
 	}
 	
 	public static final void onTutorialQuestionMark(L2PcInstance player, int number)

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

@@ -4690,8 +4690,8 @@ public final class L2PcInstance extends L2Playable
 	
 	public void queryGameGuard()
 	{
-		this.getClient().setGameGuardOk(false);
-		this.sendPacket(new GameGuardQuery());
+		getClient().setGameGuardOk(false);
+		sendPacket(GameGuardQuery.STATIC_PACKET);
 		if (Config.GAMEGUARD_ENFORCE)
 		{
 			ThreadPoolManager.getInstance().scheduleGeneral(new GameGuardCheck(), 30*1000);
@@ -6383,7 +6383,7 @@ public final class L2PcInstance extends L2Playable
 		SystemMessage msg = SystemMessage.getSystemMessage(SystemMessageId.C1_CONFIRMED_TRADE);
 		msg.addPcName(partner);
 		sendPacket(msg);
-		sendPacket(new TradeOtherDone());
+		sendPacket(TradeOtherDone.STATIC_PACKET);
 	}
 	
 	public void onTradeCancel(L2PcInstance partner)
@@ -13374,7 +13374,7 @@ public final class L2PcInstance extends L2Playable
 			addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false);
 	}
 	
-	private FastMap<Integer, TimeStamp> _reuseTimeStampsItems = new FastMap<>();
+	private final FastMap<Integer, TimeStamp> _reuseTimeStampsItems = new FastMap<>();
 	
 	public void addTimeStampItem(L2ItemInstance item, long reuse)
 	{

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

@@ -1124,7 +1124,7 @@ public final class QuestState
 	
 	public void closeTutorialHtml()
 	{
-		_player.sendPacket(new TutorialCloseHtml());
+		_player.sendPacket(TutorialCloseHtml.STATIC_PACKET);
 	}
 	
 	public void onTutorialClientEvent(int number)

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

@@ -599,7 +599,7 @@ public class EnterWorld extends L2GameClientPacket
 		
 		if (!activeChar.getPremiumItemList().isEmpty())
 		{
-			activeChar.sendPacket(new ExNotifyPremiumItem());
+			activeChar.sendPacket(ExNotifyPremiumItem.STATIC_PACKET);
 		}
 		
 		for (PlayerSpawnListener listener : listeners)

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

@@ -36,7 +36,7 @@ public class RequestAllFortressInfo extends L2GameClientPacket
 		L2GameClient client = this.getClient();
 		if (client != null)
 		{
-			client.sendPacket(new ExShowFortressInfo());
+			client.sendPacket(ExShowFortressInfo.STATIC_PACKET);
 		}
 	}
 	

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

@@ -18,30 +18,23 @@ import com.l2jserver.gameserver.network.serverpackets.ExReplyDominionInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExShowOwnthingPos;
 
 /**
- *
- * @author  JIV
+ * @author JIV
  */
 public class RequestDominionInfo extends L2GameClientPacket
 {
 	private static final String _C__D0_58_REQUESTDOMINIONINFO = "[C] D0:58 RequestDominionInfo";
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#readImpl()
-	 */
 	@Override
 	protected void readImpl()
 	{
 		// nothing
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#runImpl()
-	 */
 	@Override
 	protected void runImpl()
 	{
-		sendPacket(new ExReplyDominionInfo());
-		sendPacket(new ExShowOwnthingPos());
+		sendPacket(ExReplyDominionInfo.STATIC_PACKET);
+		sendPacket(ExShowOwnthingPos.STATIC_PACKET);
 	}
 	
 	@Override
@@ -50,9 +43,6 @@ public class RequestDominionInfo extends L2GameClientPacket
 		return false;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.clientpackets.L2GameClientPacket#getType()
-	 */
 	@Override
 	public String getType()
 	{

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

@@ -36,7 +36,7 @@ public class RequestSeedPhase extends L2GameClientPacket
 		L2PcInstance activeChar = getClient().getActiveChar();
 		if (activeChar == null)
 			return;
-		activeChar.sendPacket(new ExShowSeedMapInfo());
+		activeChar.sendPacket(ExShowSeedMapInfo.STATIC_PACKET);
 	}
 	
 	@Override

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

@@ -18,17 +18,9 @@ import java.util.List;
 
 import javolution.util.FastList;
 
-/**
- *
- * MagicEffectIcons
- * format   h (dhd)
- *
- * @version $Revision: 1.3.2.1.2.6 $ $Date: 2005/04/05 19:41:08 $
- */
 public class AbnormalStatusUpdate extends L2GameServerPacket
 {
-	private static final String _S__97_ABNORMALSTATUSUPDATE = "[S] 85 AbnormalStatusUpdate";
-	private List<Effect> _effects;
+	private final List<Effect> _effects;
 	
 	private static class Effect
 	{
@@ -56,7 +48,7 @@ public class AbnormalStatusUpdate extends L2GameServerPacket
 	 */
 	public void addEffect(int skillId, int level, int duration)
 	{
-		if (skillId == 2031 ||skillId == 2032 ||skillId == 2037 || skillId == 26025 || skillId == 26026)
+		if (skillId == 2031 || skillId == 2032 || skillId == 2037 || skillId == 26025 || skillId == 26026)
 			return;
 		_effects.add(new Effect(skillId, level, duration));
 	}
@@ -79,10 +71,4 @@ public class AbnormalStatusUpdate extends L2GameServerPacket
 				writeD(temp._duration / 1000);
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__97_ABNORMALSTATUSUPDATE;
-	}
 }

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

@@ -27,16 +27,8 @@ import com.l2jserver.gameserver.model.actor.instance.L2NpcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.effects.AbnormalEffect;
 
-/**
- * This class ...
- * @version $Revision: 1.7.2.4.2.9 $ $Date: 2005/04/11 10:05:54 $
- */
 public abstract class AbstractNpcInfo extends L2GameServerPacket
 {
-	// ddddddddddddddddddffffdddcccccSSddd dddddc
-	// ddddddddddddddddddffffdddcccccSSddd dddddccffd
-	
-	private static final String _S__22_NPCINFO = "[S] 0c NpcInfo";
 	protected int _x, _y, _z, _heading;
 	protected int _idTemplate;
 	protected boolean _isAttackable, _isSummoned;
@@ -70,12 +62,6 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 		_walkSpd = cha.getTemplate().getBaseWalkSpd();
 	}
 	
-	@Override
-	public String getType()
-	{
-		return _S__22_NPCINFO;
-	}
-	
 	/**
 	 * Packet for Npcs
 	 */
@@ -254,7 +240,7 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 			writeC(1);
 			writeC(_trap.isInCombat() ? 1 : 0);
 			writeC(_trap.isAlikeDead() ? 1 : 0);
-			writeC(_isSummoned ? 2 : 0); // 0=teleported 1=default 2=summoned
+			writeC(_isSummoned ? 2 : 0); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
 			writeD(-1); // High Five NPCString ID
 			writeS(_name);
 			writeD(-1); // High Five NPCString ID
@@ -374,11 +360,11 @@ public abstract class AbstractNpcInfo extends L2GameServerPacket
 			writeD(_rhand); // right hand weapon
 			writeD(_chest);
 			writeD(_lhand); // left hand weapon
-			writeC(1); // name above char 1=true ... ??
-			writeC(1); // always running 1=running 0=walking
+			writeC(0x01); // name above char 1=true ... ??
+			writeC(0x01); // always running 1=running 0=walking
 			writeC(_summon.isInCombat() ? 1 : 0);
 			writeC(_summon.isAlikeDead() ? 1 : 0);
-			writeC(_val); // 0=teleported 1=default 2=summoned
+			writeC(_val); // invisible ?? 0=false 1=true 2=summoned (only works if model has a summon animation)
 			writeD(-1); // High Five NPCString ID
 			writeS(_name);
 			writeD(-1); // High Five NPCString ID

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

@@ -1,43 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation, either version 3 of the License, or (at your option) any later
- * version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License along with
- * this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package com.l2jserver.gameserver.network.serverpackets;
-
-/**
- * This class makes runImpl() and writeImpl() abstract for custom classes outside of this package
- *
- * @version $Revision: $ $Date: $
- * @author  galun
- */
-public abstract class AbstractServerBasePacket extends L2GameServerPacket
-{
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#runImpl()
-	 */
-	@Override
-	abstract public void runImpl();
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-	 */
-	@Override
-	abstract protected void writeImpl();
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	abstract public String getType();
-}

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

@@ -15,12 +15,10 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * @author  Kerberos
+ * @author Kerberos
  */
 public class AcquireSkillDone extends L2GameServerPacket
 {
-	private static final String _S__94_ACQUIRESKILLDONE = "[S] 94 AcquireSkillDone";
-	
 	public AcquireSkillDone()
 	{
 		//
@@ -31,10 +29,4 @@ public class AcquireSkillDone extends L2GameServerPacket
 	{
 		writeC(0x94);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__94_ACQUIRESKILLDONE;
-	}
 }

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

@@ -24,14 +24,10 @@ import com.l2jserver.gameserver.model.holders.ItemHolder;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 
 /**
- * format dddd d (ddQd)
- * @version 1.5
  * @author Zoey76
  */
 public class AcquireSkillInfo extends L2GameServerPacket
 {
-	private static final String _S__91_ACQUIRESKILLINFO = "[S] 91 AcquireSkillInfo";
-	
 	private final AcquireSkillType _type;
 	private final int _id;
 	private final int _level;
@@ -125,10 +121,4 @@ public class AcquireSkillInfo extends L2GameServerPacket
 			writeD(temp.unk);
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__91_ACQUIRESKILLINFO;
-	}
 }

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

@@ -18,13 +18,8 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.model.base.AcquireSkillType;
 
-/**
- * TODO: Gather samples from newer chronicles.
- * @version 1.4
- */
 public final class AcquireSkillList extends L2GameServerPacket
 {
-	private static final String _S__90_AQUIRESKILLLIST = "[S] 90 AquireSkillList";
 	private final FastList<Skill> _skills;
 	private final AcquireSkillType _skillType;
 	
@@ -85,10 +80,4 @@ public final class AcquireSkillList extends L2GameServerPacket
 			}
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__90_AQUIRESKILLLIST;
-	}
 }

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

@@ -14,15 +14,8 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- */
 public final class ActionFailed extends L2GameServerPacket
 {
-	private static final String _S__35_ACTIONFAILED = "[S] 1f ActionFailed";
 	public static final ActionFailed STATIC_PACKET = new ActionFailed();
 	
 	private ActionFailed()
@@ -34,10 +27,4 @@ public final class ActionFailed extends L2GameServerPacket
 	{
 		writeC(0x1f);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__35_ACTIONFAILED;
-	}
 }

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

@@ -21,11 +21,10 @@ import java.util.List;
 /**
  * This class is made to create packets with any format
  * @author Maktakien
- *
  */
 public class AdminForgePacket extends L2GameServerPacket
 {
-	private List<Part> _parts = new ArrayList<>();
+	private final List<Part> _parts = new ArrayList<>();
 	
 	private static class Part
 	{
@@ -47,56 +46,51 @@ public class AdminForgePacket extends L2GameServerPacket
 	@Override
 	protected void writeImpl()
 	{
-		for(Part p : _parts)
+		for (Part p : _parts)
 		{
 			generate(p.b, p.str);
 		}
 		
 	}
 	
-	@Override
-	public String getType()
-	{
-		return "[S] -1 AdminForge";
-	}
 	/**
 	 * @param b
 	 * @param string
-	 * @return 
+	 * @return
 	 */
 	public boolean generate(byte b, String string)
 	{
-		if((b == 'C')||(b == 'c'))
+		if ((b == 'C') || (b == 'c'))
 		{
 			writeC(Integer.decode(string));
 			return true;
 		}
-		else if((b == 'D')||(b == 'd'))
+		else if ((b == 'D') || (b == 'd'))
 		{
 			writeD(Integer.decode(string));
 			return true;
 		}
-		else if((b == 'H')||(b == 'h'))
+		else if ((b == 'H') || (b == 'h'))
 		{
 			writeH(Integer.decode(string));
 			return true;
 		}
-		else if((b == 'F')||(b == 'f'))
+		else if ((b == 'F') || (b == 'f'))
 		{
 			writeF(Double.parseDouble(string));
 			return true;
 		}
-		else if((b == 'S')||(b == 's'))
+		else if ((b == 'S') || (b == 's'))
 		{
 			writeS(string);
 			return true;
 		}
-		else if((b == 'B')||(b == 'b')||(b == 'X')||(b == 'x'))
+		else if ((b == 'B') || (b == 'b') || (b == 'X') || (b == 'x'))
 		{
 			writeB(new BigInteger(string).toByteArray());
 			return true;
 		}
-		else if ((b == 'Q')||(b == 'q'))
+		else if ((b == 'Q') || (b == 'q'))
 		{
 			writeQ(Long.decode(string));
 			return true;

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

@@ -17,18 +17,22 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.entity.ClanHall;
 import com.l2jserver.gameserver.model.entity.ClanHall.ClanHallFunction;
 import com.l2jserver.gameserver.model.entity.clanhall.AuctionableHall;
+
+
 /**
- *
- * @author  Steuf
+ * @author Steuf
  */
 public class AgitDecoInfo extends L2GameServerPacket
 {
-	private static final String _S__F7_AGITDECOINFO = "[S] fd AgitDecoInfo";
-	private AuctionableHall _clanHall;
+	private final AuctionableHall _clanHall;
 	private ClanHallFunction _function;
-	public AgitDecoInfo(AuctionableHall ClanHall){
+	
+	public AgitDecoInfo(AuctionableHall ClanHall)
+	{
 		_clanHall = ClanHall;
 	}
+	
+	//@formatter:off
 	/*
 	 * Packet send, must be confirmed
 	 	writeC(0xf7);
@@ -48,101 +52,104 @@ public class AgitDecoInfo extends L2GameServerPacket
 		writeD(0);
 		writeD(0);
 	 */
+	//@formatter:on
 	@Override
-	protected final void writeImpl(){
+	protected final void writeImpl()
+	{
 		writeC(0xfd);
 		writeD(_clanHall.getId()); // clanhall id
-		//FUNC_RESTORE_HP
+		// FUNC_RESTORE_HP
 		_function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_HP);
-		if(_function == null || _function.getLvl() == 0)
+		if (_function == null || _function.getLvl() == 0)
 			writeC(0);
-		else if((_clanHall.getGrade() == 0 && _function.getLvl() < 220) || (_clanHall.getGrade() == 1 && _function.getLvl() < 160) ||
-				(_clanHall.getGrade() == 2 && _function.getLvl() < 260) || (_clanHall.getGrade() == 3 && _function.getLvl() < 300))
+		else if ((_clanHall.getGrade() == 0 && _function.getLvl() < 220) || (_clanHall.getGrade() == 1 && _function.getLvl() < 160) || (_clanHall.getGrade() == 2 && _function.getLvl() < 260) || (_clanHall.getGrade() == 3 && _function.getLvl() < 300))
 			writeC(1);
 		else
 			writeC(2);
-		//FUNC_RESTORE_MP
+		// FUNC_RESTORE_MP
 		_function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_MP);
-		if(_function == null || _function.getLvl() == 0){
+		if (_function == null || _function.getLvl() == 0)
+		{
 			writeC(0);
 			writeC(0);
-		}else if(((_clanHall.getGrade() == 0 || _clanHall.getGrade() == 1) && _function.getLvl() < 25) ||
-				(_clanHall.getGrade() == 2 && _function.getLvl() < 30) || (_clanHall.getGrade() == 3 && _function.getLvl() < 40)){
+		}
+		else if (((_clanHall.getGrade() == 0 || _clanHall.getGrade() == 1) && _function.getLvl() < 25) || (_clanHall.getGrade() == 2 && _function.getLvl() < 30) || (_clanHall.getGrade() == 3 && _function.getLvl() < 40))
+		{
 			writeC(1);
 			writeC(1);
-		}else {
+		}
+		else
+		{
 			writeC(2);
 			writeC(2);
 		}
-		//FUNC_RESTORE_EXP
+		// FUNC_RESTORE_EXP
 		_function = _clanHall.getFunction(ClanHall.FUNC_RESTORE_EXP);
-		if(_function == null || _function.getLvl() == 0)
+		if (_function == null || _function.getLvl() == 0)
 			writeC(0);
-		else if((_clanHall.getGrade() == 0 && _function.getLvl() < 25) || (_clanHall.getGrade() == 1 && _function.getLvl() < 30) ||
-				(_clanHall.getGrade() == 2 && _function.getLvl() < 40) || (_clanHall.getGrade() == 3 && _function.getLvl() < 50))
+		else if ((_clanHall.getGrade() == 0 && _function.getLvl() < 25) || (_clanHall.getGrade() == 1 && _function.getLvl() < 30) || (_clanHall.getGrade() == 2 && _function.getLvl() < 40) || (_clanHall.getGrade() == 3 && _function.getLvl() < 50))
 			writeC(1);
 		else
 			writeC(2);
 		// FUNC_TELEPORT
 		_function = _clanHall.getFunction(ClanHall.FUNC_TELEPORT);
-		if(_function == null || _function.getLvl() == 0)
+		if (_function == null || _function.getLvl() == 0)
 			writeC(0);
-		else if(_function.getLvl() < 2)
+		else if (_function.getLvl() < 2)
 			writeC(1);
 		else
 			writeC(2);
 		writeC(0);
-		//CURTAINS
+		// CURTAINS
 		_function = _clanHall.getFunction(ClanHall.FUNC_DECO_CURTAINS);
-		if(_function == null || _function.getLvl() == 0)
+		if (_function == null || _function.getLvl() == 0)
 			writeC(0);
-		else if(_function.getLvl() <= 1)
+		else if (_function.getLvl() <= 1)
 			writeC(1);
 		else
 			writeC(2);
-		//FUNC_ITEM_CREATE
+		// FUNC_ITEM_CREATE
 		_function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
-		if(_function == null || _function.getLvl() == 0)
+		if (_function == null || _function.getLvl() == 0)
 			writeC(0);
-		else if((_clanHall.getGrade() == 0 && _function.getLvl() < 2) || _function.getLvl() < 3)
+		else if ((_clanHall.getGrade() == 0 && _function.getLvl() < 2) || _function.getLvl() < 3)
 			writeC(1);
 		else
 			writeC(2);
 		// FUNC_SUPPORT
 		_function = _clanHall.getFunction(ClanHall.FUNC_SUPPORT);
-		if(_function == null || _function.getLvl() == 0){
+		if (_function == null || _function.getLvl() == 0)
+		{
 			writeC(0);
 			writeC(0);
-		}else if((_clanHall.getGrade() == 0 && _function.getLvl() < 2) || (_clanHall.getGrade() == 1 && _function.getLvl() < 4) ||
-				(_clanHall.getGrade() == 2 && _function.getLvl() < 5) || (_clanHall.getGrade() == 3 && _function.getLvl() < 8)){
+		}
+		else if ((_clanHall.getGrade() == 0 && _function.getLvl() < 2) || (_clanHall.getGrade() == 1 && _function.getLvl() < 4) || (_clanHall.getGrade() == 2 && _function.getLvl() < 5) || (_clanHall.getGrade() == 3 && _function.getLvl() < 8))
+		{
 			writeC(1);
 			writeC(1);
-		}else{
+		}
+		else
+		{
 			writeC(2);
 			writeC(2);
 		}
-		//Front Plateform
+		// Front Plateform
 		_function = _clanHall.getFunction(ClanHall.FUNC_DECO_FRONTPLATEFORM);
-		if(_function == null || _function.getLvl() == 0)
+		if (_function == null || _function.getLvl() == 0)
 			writeC(0);
-		else if(_function.getLvl() <= 1)
+		else if (_function.getLvl() <= 1)
 			writeC(1);
 		else
 			writeC(2);
-		//FUNC_ITEM_CREATE
+		// FUNC_ITEM_CREATE
 		_function = _clanHall.getFunction(ClanHall.FUNC_ITEM_CREATE);
-		if(_function == null || _function.getLvl() == 0)
+		if (_function == null || _function.getLvl() == 0)
 			writeC(0);
-		else if((_clanHall.getGrade() == 0 && _function.getLvl() < 2) || _function.getLvl() < 3)
+		else if ((_clanHall.getGrade() == 0 && _function.getLvl() < 2) || _function.getLvl() < 3)
 			writeC(1);
 		else
 			writeC(2);
 		writeD(0);
 		writeD(0);
 	}
-	@Override
-	public String getType()
-	{
-		return _S__F7_AGITDECOINFO;
-	}
 }

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

@@ -23,8 +23,6 @@ import com.l2jserver.gameserver.network.clientpackets.RequestAllyInfo;
 
 /**
  * Sent in response to {@link RequestAllyInfo}, if applicable.<BR>
- * <BR>
- * Exclusively for <a href="http://www.l2jserver.com/">L2jServer</a>.
  * @author afk5min
  */
 public class AllianceInfo extends L2GameServerPacket
@@ -81,12 +79,6 @@ public class AllianceInfo extends L2GameServerPacket
 		}
 	}
 	
-	@Override
-	public String getType()
-	{
-		return "[S] B5 AllianceInfoPacket";
-	}
-	
 	public String getName()
 	{
 		return _name;

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

@@ -16,27 +16,10 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.cache.CrestCache;
 
-
-/**
- * <code>
- * sample
- * 0000: c7 6d 06 00 00 36 05 00 00 42 4d 36 05 00 00 00    .m...6...BM6....
- * 0010: 00 00 00 36 04 00 00 28 00 00 00 10 00 00 00 10    ...6...(........
- * 0020: 00 00 00 01 00 08 00 00 00 00 00 00 01 00 00 c4    ................
- * 0030: ...
- * 0530: 10 91 00 00 00 60 9b d1 01 e4 6e ee 52 97 dd       .....`....n.R..
- * </code>
- *
- *
- * format   dd x...x
- *
- * @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/03/27 15:29:39 $
- */
 public class AllyCrest extends L2GameServerPacket
 {
-	private static final String _S__AF_ALLYCREST = "[S] af AllyCrest";
-	private int _crestId;
-	private byte[] _data;
+	private final int _crestId;
+	private final byte[] _data;
 	
 	public AllyCrest(int crestId)
 	{
@@ -55,12 +38,8 @@ public class AllyCrest extends L2GameServerPacket
 			writeB(_data);
 		}
 		else
+		{
 			writeD(0);
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__AF_ALLYCREST;
+		}
 	}
 }

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

@@ -14,29 +14,14 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-/**
- * sample
- * <p>
- * 7d
- * c1 b2 e0 4a
- * 00 00 00 00
- * <p>
- *
- * format
- * cdd
- *
- * @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public class AskJoinAlly extends L2GameServerPacket
 {
-	private static final String _S__A8_ASKJOINALLY_0XA8 = "[S] bb AskJoinAlly 0xa8";
-	
-	private String _requestorName;
-	private int _requestorObjId;
+	private final String _requestorName;
+	private final int _requestorObjId;
 	
 	/**
-	 * @param requestorObjId 
-	 * @param requestorName 
+	 * @param requestorObjId
+	 * @param requestorName
 	 */
 	public AskJoinAlly(int requestorObjId, String requestorName)
 	{
@@ -51,10 +36,4 @@ public class AskJoinAlly extends L2GameServerPacket
 		writeD(_requestorObjId);
 		writeS(_requestorName);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__A8_ASKJOINALLY_0XA8;
-	}
 }

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

@@ -14,28 +14,10 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-
-/**
- *
- * sample
- * <p>
- * 4b
- * c1 b2 e0 4a
- * 00 00 00 00
- * <p>
- *
- * format
- * cdd
- *
- * @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public class AskJoinParty extends L2GameServerPacket
 {
-	private static final String _S__4B_ASKJOINPARTY_0X4B = "[S] 39 AskJoinParty";
-	
-	private String _requestorName;
-	private int _itemDistribution;
+	private final String _requestorName;
+	private final int _itemDistribution;
 	
 	/**
 	 * @param requestorName
@@ -54,10 +36,4 @@ public class AskJoinParty extends L2GameServerPacket
 		writeS(_requestorName);
 		writeD(_itemDistribution);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__4B_ASKJOINPARTY_0X4B;
-	}
 }

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

@@ -14,19 +14,12 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-/**
- * This class ...
- *
- * @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public final class AskJoinPledge extends L2GameServerPacket
 {
-	private static final String _S__44_ASKJOINPLEDGE = "[S] 2c AskJoinPledge";
-	
-	private int _requestorObjId;
-	private String _subPledgeName;
-	private int _pledgeType;
-	private String _pledgeName;
+	private final int _requestorObjId;
+	private final String _subPledgeName;
+	private final int _pledgeType;
+	private final String _pledgeName;
 	
 	public AskJoinPledge(int requestorObjId, String subPledgeName, int pledgeType, String pledgeName)
 	{
@@ -42,15 +35,13 @@ public final class AskJoinPledge extends L2GameServerPacket
 		writeC(0x2c);
 		writeD(_requestorObjId);
 		if (_subPledgeName != null)
+		{
 			writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);
+		}
 		if (_pledgeType != 0)
+		{
 			writeD(_pledgeType);
+		}
 		writeS(_pledgeName);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__44_ASKJOINPLEDGE;
-	}
 }

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

@@ -18,14 +18,6 @@ import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-/**
- * sample
- * 06 8f19904b 2522d04b 00000000 80 950c0000 4af50000 08f2ffff 0000    - 0 damage (missed 0x80)
- * 06 85071048 bc0e504b 32000000 10 fc41ffff fd240200 a6f5ffff 0100 bc0e504b 33000000 10                                     3....
-
- * format
- * dddc dddh (ddc)
- */
 public class Attack extends L2GameServerPacket
 {
 	public static final int HITFLAG_USESS = 0x10;
@@ -55,12 +47,11 @@ public class Attack extends L2GameServerPacket
 			// dirty fix for lags on olympiad
 			if (shld > 0 && !(target instanceof L2PcInstance && ((L2PcInstance) target).isInOlympiadMode()))
 				_flags |= HITFLAG_SHLD;
-			//			if (shld > 0)
-			//				_flags |= HITFLAG_SHLD;
+			// if (shld > 0)
+			// _flags |= HITFLAG_SHLD;
 		}
 	}
 	
-	private static final String _S__06_ATTACK = "[S] 33 Attack";
 	private final int _attackerObjId;
 	private final int _targetObjId;
 	public final boolean soulshot;
@@ -148,10 +139,4 @@ public class Attack extends L2GameServerPacket
 		writeD(_ty);
 		writeD(_tz);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__06_ATTACK;
-	}
 }

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

@@ -14,18 +14,9 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public final class AutoAttackStart extends L2GameServerPacket
 {
-	// dh
-	
-	private static final String _S__3B_AUTOATTACKSTART = "[S] 25 AutoAttackStart";
-	private int _targetObjId;
+	private final int _targetObjId;
 	
 	/**
 	 * @param targetId
@@ -41,10 +32,4 @@ public final class AutoAttackStart extends L2GameServerPacket
 		writeC(0x25);
 		writeD(_targetObjId);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__3B_AUTOATTACKSTART;
-	}
 }

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

@@ -14,18 +14,9 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public class AutoAttackStop extends L2GameServerPacket
 {
-	// dh
-	
-	private static final String _S__3C_AUTOATTACKSTOP = "[S] 26 AutoAttackStop";
-	private int _targetObjId;
+	private final int _targetObjId;
 	
 	/**
 	 * @param targetObjId
@@ -41,10 +32,4 @@ public class AutoAttackStop extends L2GameServerPacket
 		writeC(0x26);
 		writeD(_targetObjId);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__3C_AUTOATTACKSTOP;
-	}
 }

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

@@ -20,47 +20,11 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2TradeList;
 import com.l2jserver.gameserver.model.L2TradeList.L2TradeItem;
 
-
-/**
- * sample
- *
- * 1d
- * 1e 00 00 00 			// ??
- * 5c 4a a0 7c 			// buy list id
- * 02 00				// item count
- *
- * 04 00 				// itemType1  0-weapon/ring/earring/necklace  1-armor/shield  4-item/questitem/adena
- * 00 00 00 00 			// objectid
- * 32 04 00 00 			// itemid
- * 00 00 00 00 			// count
- * 05 00 				// itemType2  0-weapon  1-shield/armor  2-ring/earring/necklace  3-questitem  4-adena  5-item
- * 00 00
- * 60 09 00 00			// price
- *
- * 00 00
- * 00 00 00 00
- * b6 00 00 00
- * 00 00 00 00
- * 00 00
- * 00 00
- * 80 00 				//	body slot 	 these 4 values are only used if itemtype1 = 0 or 1
- * 00 00 				//
- * 00 00 				//
- * 00 00 				//
- * 50 c6 0c 00
- *
-
- * format   dd h (h dddhh hhhh d)	revision 377
- * format   dd h (h dddhh dhhh d)	revision 377
- *
- * @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public final class BuyList extends L2GameServerPacket
 {
-	private static final String _S__1D_BUYLIST = "[S] 07 BuyList";
-	private int _listId;
-	private Collection<L2TradeItem> _list;
-	private long _money;
+	private final int _listId;
+	private final Collection<L2TradeItem> _list;
+	private final long _money;
 	private double _taxRate = 0;
 	
 	public BuyList(L2TradeList list, long currentMoney, double taxRate)
@@ -77,7 +41,7 @@ public final class BuyList extends L2GameServerPacket
 		writeC(0xFE);
 		writeH(0xB7);
 		writeD(0x00);
-		writeQ(_money);		// current money
+		writeQ(_money); // current money
 		writeD(_listId);
 		
 		writeH(_list.size());
@@ -91,16 +55,16 @@ public final class BuyList extends L2GameServerPacket
 				writeD(0);
 				writeQ(item.getCurrentCount() < 0 ? 0 : item.getCurrentCount());
 				writeH(item.getTemplate().getType2());
-				writeH(item.getTemplate().getType1());	// Custom Type 1
-				writeH(0x00);	// isEquipped
-				writeD(item.getTemplate().getBodyPart());	// Body Part
-				writeH(0x00);	// Enchant
-				writeH(0x00);	// Custom Type
-				writeD(0x00);	// Augment
-				writeD(-1);		// Mana
-				writeD(-9999);	// Time
-				writeH(0x00);	// Element Type
-				writeH(0x00);	// Element Power
+				writeH(item.getTemplate().getType1()); // Custom Type 1
+				writeH(0x00); // isEquipped
+				writeD(item.getTemplate().getBodyPart()); // Body Part
+				writeH(0x00); // Enchant
+				writeH(0x00); // Custom Type
+				writeD(0x00); // Augment
+				writeD(-1); // Mana
+				writeD(-9999); // Time
+				writeH(0x00); // Element Type
+				writeH(0x00); // Element Power
 				for (byte i = 0; i < 6; i++)
 				{
 					writeH(0x00);
@@ -117,10 +81,4 @@ public final class BuyList extends L2GameServerPacket
 			}
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__1D_BUYLIST;
-	}
 }

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

@@ -21,32 +21,14 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.instancemanager.CastleManorManager.SeedProduction;
 
 /**
- * Format: c ddh[hdddhhd]
- * c - id (0xE8)
- *
- * d - money
- * d - manor id
- * h - size
- * [
- * h - item type 1
- * d - object id
- * d - item id
- * d - count
- * h - item type 2
- * h
- * d - price
- * ]
- *
  * @author l3x
  */
 
 public final class BuyListSeed extends L2GameServerPacket
 {
-	private static final String _S__E8_BUYLISTSEED = "[S] e9 BuyListSeed";
-	
-	private int _manorId;
+	private final int _manorId;
 	private List<Seed> _list = null;
-	private long _money;
+	private final long _money;
 	
 	public BuyListSeed(long currentMoney, int castleId, List<SeedProduction> seeds)
 	{
@@ -109,12 +91,6 @@ public final class BuyListSeed extends L2GameServerPacket
 		
 	}
 	
-	@Override
-	public String getType()
-	{
-		return _S__E8_BUYLISTSEED;
-	}
-	
 	private static class Seed
 	{
 		public final int _itemId;

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

@@ -16,8 +16,6 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 public final class CSShowComBoard extends L2GameServerPacket
 {
-	private static final String _S__6E_SHOWBOARD = "[S] 7b ShowBoard";
-	
 	private final byte[] _html;
 	
 	public CSShowComBoard(final byte[] html)
@@ -29,13 +27,7 @@ public final class CSShowComBoard extends L2GameServerPacket
 	protected void writeImpl()
 	{
 		writeC(0x7b);
-		writeC(0x01); //c4 1 to show community 00 to hide
+		writeC(0x01); // c4 1 to show community 00 to hide
 		writeB(_html);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__6E_SHOWBOARD;
-	}
 }

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

@@ -15,10 +15,8 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 public class CameraMode extends L2GameServerPacket
-{
-	private static final String _S__F1_CAMERAMODE = "[S] f7 CameraMode";
-	
-	private int _mode;
+{	
+	private final int _mode;
 	
 	/**
 	 * Forces client camera mode change
@@ -37,10 +35,4 @@ public class CameraMode extends L2GameServerPacket
 		writeC(0xf7);
 		writeD(_mode);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__F1_CAMERAMODE;
-	}
 }

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

@@ -16,20 +16,10 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-/**
- * sample
-
- * format
- * d
- *
- * @version $Revision: 1.1.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- */
 public class ChairSit extends L2GameServerPacket
-{
-	private static final String _S__e1_CHAIRSIT = "[S] ed ChairSit";
-	
-	private L2PcInstance _activeChar;
-	private int _staticObjectId;
+{	
+	private final L2PcInstance _activeChar;
+	private final int _staticObjectId;
 	
 	/**
 	 * @param player 
@@ -48,10 +38,4 @@ public class ChairSit extends L2GameServerPacket
 		writeD(_activeChar.getObjectId());
 		writeD(_staticObjectId);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__e1_CHAIRSIT;
-	}
 }

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

@@ -16,24 +16,13 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 
-/**
- *
- * sample
- *
- * 0000: 3e 2a 89 00 4c 01 00 00 00                         .|...
- *
- * format   dd
- *
- * @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/03/27 15:29:57 $
- */
 public class ChangeMoveType extends L2GameServerPacket
 {
-	private static final String _S__3E_CHANGEMOVETYPE = "[S] 28 ChangeMoveType";
 	public static final int WALK = 0;
 	public static final int RUN = 1;
 	
-	private int _charObjId;
-	private boolean _running;
+	private final int _charObjId;
+	private final boolean _running;
 	
 	public ChangeMoveType(L2Character character)
 	{
@@ -47,12 +36,6 @@ public class ChangeMoveType extends L2GameServerPacket
 		writeC(0x28);
 		writeD(_charObjId);
 		writeD(_running ? RUN : WALK);
-		writeD(0); //c2
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__3E_CHANGEMOVETYPE;
+		writeD(0); // c2
 	}
 }

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

@@ -16,23 +16,11 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.actor.L2Character;
 
-/**
- *
- * sample
- *
- * 0000: 3f 2a 89 00 4c 01 00 00 00 0a 15 00 00 66 fe 00    ?*..L........f..
- * 0010: 00 7c f1 ff ff                                     .|...
- *
- * format   dd ddd
- *
- * @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/03/27 15:29:57 $
- */
 public class ChangeWaitType extends L2GameServerPacket
 {
-	private static final String _S__3F_CHANGEWAITTYPE = "[S] 29 ChangeWaitType";
-	private int _charObjId;
-	private int _moveType;
-	private int _x, _y, _z;
+	private final int _charObjId;
+	private final int _moveType;
+	private final int _x, _y, _z;
 	
 	public static final int WT_SITTING = 0;
 	public static final int WT_STANDING = 1;
@@ -58,11 +46,5 @@ public class ChangeWaitType extends L2GameServerPacket
 		writeD(_x);
 		writeD(_y);
 		writeD(_z);
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__3F_CHANGEWAITTYPE;
-	}
+	}	
 }

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

@@ -16,8 +16,6 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 public class CharCreateFail extends L2GameServerPacket
 {
-	private static final String _S__26_CHARCREATEFAIL = "[S] 10 CharCreateFail";
-	
 	public static final int REASON_CREATION_FAILED = 0x00; // "Your character creation has failed."
 	public static final int REASON_TOO_MANY_CHARACTERS = 0x01; // "You cannot create another character. Please delete the existing character and try again." Removes all settings that were selected (race, class, etc).
 	public static final int REASON_NAME_ALREADY_EXISTS = 0x02; // "This name already exists."
@@ -26,7 +24,7 @@ public class CharCreateFail extends L2GameServerPacket
 	public static final int REASON_CREATE_NOT_ALLOWED = 0x05; // "Characters cannot be created from this server."
 	public static final int REASON_CHOOSE_ANOTHER_SVR = 0x06; // "Unable to create character. You are unable to create a new character on the selected server. A restriction is in place which restricts users from creating characters on different servers where no previous character exists. Please choose another server."
 	
-	private int _error;
+	private final int _error;
 	
 	public CharCreateFail(int errorCode)
 	{
@@ -39,10 +37,4 @@ public class CharCreateFail extends L2GameServerPacket
 		writeC(0x10);
 		writeD(_error);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__26_CHARCREATEFAIL;
-	}
 }

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

@@ -14,26 +14,12 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- */
 public class CharCreateOk extends L2GameServerPacket
 {
-	private static final String _S__25_CHARCREATEOK = "[S] 0f CharCreateOk";
-	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x0f);
 		writeD(0x01);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__25_CHARCREATEOK;
-	}
 }

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

@@ -14,21 +14,13 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- */
 public class CharDeleteFail extends L2GameServerPacket
 {
-	private static final String _S__34_CHARDELETEFAIL = "[S] 1e CharDeleteFail";
-	
 	public static final int REASON_DELETION_FAILED = 0x01;
 	public static final int REASON_YOU_MAY_NOT_DELETE_CLAN_MEMBER = 0x02;
 	public static final int REASON_CLAN_LEADERS_MAY_NOT_BE_DELETED = 0x03;
 	
-	private int _error;
+	private final int _error;
 	
 	public CharDeleteFail(int errorCode)
 	{
@@ -41,10 +33,4 @@ public class CharDeleteFail extends L2GameServerPacket
 		writeC(0x1e);
 		writeD(_error);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__34_CHARDELETEFAIL;
-	}
 }

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

@@ -14,25 +14,11 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public class CharDeleteSuccess extends L2GameServerPacket
 {
-	private static final String _S__33_CHARDELETEOK = "[S] 1d CharDeleteOk";
-	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0x1d);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__33_CHARDELETEOK;
-	}
 }

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

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 
 public class CharInfo extends L2GameServerPacket
 {
-	private static final String _S__03_CHARINFO = "[S] 31 CharInfo";
 	private final L2PcInstance _activeChar;
 	private final Inventory _inv;
 	private int _objId;
@@ -288,10 +287,10 @@ public class CharInfo extends L2GameServerPacket
 			}
 			else
 			{
-				writeD(0);
-				writeD(0);
-				writeD(0);
-				writeD(0);
+				writeD(0x00);
+				writeD(0x00);
+				writeD(0x00);
+				writeD(0x00);
 			}
 			
 			writeC(_activeChar.isSitting() ? 0 : 1); // standing = 1 sitting = 0
@@ -358,10 +357,4 @@ public class CharInfo extends L2GameServerPacket
 			writeD(_activeChar.getSpecialEffect());
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__03_CHARINFO;
-	}
 }

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

@@ -17,17 +17,10 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.GameTimeController;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-/**
- * This class ...
- * 
- * @version $Revision: 1.4.2.5.2.6 $ $Date: 2005/03/27 15:29:39 $
- */
 public class CharSelected extends L2GameServerPacket
 {
-	// SdSddddddddddffddddddddddddddddddddddddddddddddddddddddd d
-	private static final String _S__21_CHARSELECTED = "[S] 0b CharSelected";
-	private L2PcInstance _activeChar;
-	private int _sessionId;
+	private final L2PcInstance _activeChar;
+	private final int _sessionId;
 	
 	/**
 	 * @param cha
@@ -86,10 +79,4 @@ public class CharSelected extends L2GameServerPacket
 		writeB(new byte[64]);
 		writeD(0x00);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__21_CHARSELECTED;
-	}
 }

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

@@ -33,20 +33,14 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.itemcontainer.Inventory;
 import com.l2jserver.gameserver.network.L2GameClient;
 
-/**
- * This class ...
- *
- * @version $Revision: 1.8.2.4.2.6 $ $Date: 2005/04/06 16:13:46 $
- */
 public class CharSelectionInfo extends L2GameServerPacket
 {
-	// d SdSddddddddddffddddddddddddddddddddddddddddddddddddddddddddddffd
-	private static final String _S__09_CHARSELECTINFO = "[S] 09 CharSelectInfo";
 	private static Logger _log = Logger.getLogger(CharSelectionInfo.class.getName());
-	private String _loginName;
-	private int _sessionId, _activeId;
-	private CharSelectInfoPackage[] _characterPackages;
-
+	private final String _loginName;
+	private final int _sessionId;
+	private int _activeId;
+	private final CharSelectInfoPackage[] _characterPackages;
+	
 	/**
 	 * Constructor for CharSelectionInfo.
 	 * @param loginName
@@ -81,7 +75,7 @@ public class CharSelectionInfo extends L2GameServerPacket
 		writeD(size);
 		
 		// Can prevent players from creating new characters (if 0); (if 1, the client will ask if chars may be created (0x13) Response: (0x0D) )
-		writeD(0x07);
+		writeD(Config.MAX_CHARACTERS_NUMBER_PER_ACCOUNT);
 		writeC(0x00);
 		
 		long lastAccess = 0L;
@@ -119,23 +113,23 @@ public class CharSelectionInfo extends L2GameServerPacket
 			
 			writeD(0x01); // active ??
 			
-			writeD(charInfoPackage.getX()); // x
-			writeD(charInfoPackage.getY()); // y
-			writeD(charInfoPackage.getZ()); // z
+			writeD(charInfoPackage.getX());
+			writeD(charInfoPackage.getY());
+			writeD(charInfoPackage.getZ());
 			
-			writeF(charInfoPackage.getCurrentHp()); // hp cur
-			writeF(charInfoPackage.getCurrentMp()); // mp cur
+			writeF(charInfoPackage.getCurrentHp());
+			writeF(charInfoPackage.getCurrentMp());
 			
 			writeD(charInfoPackage.getSp());
 			writeQ(charInfoPackage.getExp());
-			writeF((float)(charInfoPackage.getExp() - ExperienceTable.getInstance().getExpForLevel(charInfoPackage.getLevel())) /
-					(ExperienceTable.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceTable.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High Five exp %
+			writeF((float) (charInfoPackage.getExp() - ExperienceTable.getInstance().getExpForLevel(charInfoPackage.getLevel())) / (ExperienceTable.getInstance().getExpForLevel(charInfoPackage.getLevel() + 1) - ExperienceTable.getInstance().getExpForLevel(charInfoPackage.getLevel()))); // High Five
+																																																																								// exp %
 			writeD(charInfoPackage.getLevel());
 			
-			writeD(charInfoPackage.getKarma()); // karma
+			writeD(charInfoPackage.getKarma());
 			writeD(charInfoPackage.getPkKills());
-			
 			writeD(charInfoPackage.getPvPKills());
+			
 			writeD(0x00);
 			writeD(0x00);
 			writeD(0x00);
@@ -181,35 +175,33 @@ public class CharSelectionInfo extends L2GameServerPacket
 			long deleteTime = charInfoPackage.getDeleteTimer();
 			int deletedays = 0;
 			if (deleteTime > 0)
-				deletedays = (int)((deleteTime-System.currentTimeMillis())/1000);
+			{
+				deletedays = (int) ((deleteTime - System.currentTimeMillis()) / 1000);
+			}
 			writeD(deletedays); // days left before
 			// delete .. if != 0
 			// then char is inactive
 			writeD(charInfoPackage.getClassId());
-			if (i == _activeId)
-				writeD(0x01);
-			else
-				writeD(0x00); //c3 auto-select char
-			
+			writeD(i == _activeId ? 0x01 : 0x00); // c3 auto-select char 
+				
 			writeC(charInfoPackage.getEnchantEffect() > 127 ? 127 : charInfoPackage.getEnchantEffect());
-			writeH(0);
-			writeH(0);
-			//writeD(charInfoPackage.getAugmentationId());
-
+			writeH(0x00);
+			writeH(0x00);
+			// writeD(charInfoPackage.getAugmentationId());
 			
-			//writeD(charInfoPackage.getTransformId()); // Used to display Transformations
+			// writeD(charInfoPackage.getTransformId()); // Used to display Transformations
 			writeD(0x00); // Currently on retail when you are on character select you don't see your transformation.
 			
 			// Freya by Vistall:
-			writeD(0); // npdid - 16024    Tame Tiny Baby Kookaburra        A9E89C
-			writeD(0); // level
-			writeD(0); // ?
-			writeD(0); // food? - 1200
-			writeF(0); // max Hp
-			writeF(0); // cur Hp
+			writeD(0x00); // npdid - 16024 Tame Tiny Baby Kookaburra A9E89C
+			writeD(0x00); // level
+			writeD(0x00); // ?
+			writeD(0x00); // food? - 1200
+			writeF(0x00); // max Hp
+			writeF(0x00); // cur Hp
 			
 			// High Five by Vistall:
-			writeD(charInfoPackage.getVitalityPoints());	// H5 Vitality
+			writeD(charInfoPackage.getVitalityPoints()); // H5 Vitality
 		}
 	}
 	
@@ -218,67 +210,54 @@ public class CharSelectionInfo extends L2GameServerPacket
 		CharSelectInfoPackage charInfopackage;
 		List<CharSelectInfoPackage> characterList = new FastList<>();
 		
-		Connection con = null;
-		try
+		try (Connection con = L2DatabaseFactory.getInstance().getConnection())
 		{
-			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement("SELECT account_name, charId, char_name, level, maxHp, curHp, maxMp, curMp, face, hairStyle, hairColor, sex, heading, x, y, z, exp, sp, karma, pvpkills, pkkills, clanid, race, classid, deletetime, cancraft, title, accesslevel, online, char_slot, lastAccess, base_class, transform_id, language, vitality_points FROM characters WHERE account_name=?");
-			statement.setString(1, loginName);
-			ResultSet charList = statement.executeQuery();
-			
-			while (charList.next())// fills the package
+			try (PreparedStatement statement = con.prepareStatement("SELECT account_name, charId, char_name, level, maxHp, curHp, maxMp, curMp, face, hairStyle, hairColor, sex, heading, x, y, z, exp, sp, karma, pvpkills, pkkills, clanid, race, classid, deletetime, cancraft, title, accesslevel, online, char_slot, lastAccess, base_class, transform_id, language, vitality_points FROM characters WHERE account_name=?"))
 			{
-				charInfopackage = restoreChar(charList);
-				if ( charInfopackage != null )
-					characterList.add(charInfopackage);
+				statement.setString(1, loginName);
+				try (ResultSet charList = statement.executeQuery())
+				{
+					while (charList.next())// fills the package
+					{
+						charInfopackage = restoreChar(charList);
+						if (charInfopackage != null)
+							characterList.add(charInfopackage);
+					}
+				}
 			}
-			
-			charList.close();
-			statement.close();
-			
 			return characterList.toArray(new CharSelectInfoPackage[characterList.size()]);
 		}
 		catch (Exception e)
 		{
 			_log.log(Level.WARNING, "Could not restore char info: " + e.getMessage(), e);
 		}
-		finally
-		{
-			L2DatabaseFactory.close(con);
-		}
 		return new CharSelectInfoPackage[0];
 	}
 	
 	private static void loadCharacterSubclassInfo(CharSelectInfoPackage charInfopackage, int ObjectId, int activeClassId)
 	{
-		Connection con = null;
-		try
+		try (Connection con = L2DatabaseFactory.getInstance().getConnection())
 		{
-			con = L2DatabaseFactory.getInstance().getConnection();
-			PreparedStatement statement = con.prepareStatement("SELECT exp, sp, level FROM character_subclasses WHERE charId=? && class_id=? ORDER BY charId");
-			statement.setInt(1, ObjectId);
-			statement.setInt(2, activeClassId);
-			ResultSet charList = statement.executeQuery();
-			
-			if (charList.next())
+			try (PreparedStatement statement = con.prepareStatement("SELECT exp, sp, level FROM character_subclasses WHERE charId=? && class_id=? ORDER BY charId"))
 			{
-				charInfopackage.setExp(charList.getLong("exp"));
-				charInfopackage.setSp(charList.getInt("sp"));
-				charInfopackage.setLevel(charList.getInt("level"));
+				statement.setInt(1, ObjectId);
+				statement.setInt(2, activeClassId);
+				try (ResultSet charList = statement.executeQuery())
+				{
+					if (charList.next())
+					{
+						charInfopackage.setExp(charList.getLong("exp"));
+						charInfopackage.setSp(charList.getInt("sp"));
+						charInfopackage.setLevel(charList.getInt("level"));
+					}
+				}
 			}
 			
-			charList.close();
-			statement.close();
-			
 		}
 		catch (Exception e)
 		{
 			_log.log(Level.WARNING, "Could not restore char subclass info: " + e.getMessage(), e);
 		}
-		finally
-		{
-			L2DatabaseFactory.close(con);
-		}
 	}
 	
 	private static CharSelectInfoPackage restoreChar(ResultSet chardata) throws Exception
@@ -293,7 +272,7 @@ public class CharSelectionInfo extends L2GameServerPacket
 			if (System.currentTimeMillis() > deletetime)
 			{
 				L2Clan clan = ClanTable.getInstance().getClan(chardata.getInt("clanid"));
-				if(clan != null)
+				if (clan != null)
 					clan.removeClanMember(objectId, 0);
 				
 				L2GameClient.deleteCharByObjId(objectId);
@@ -329,7 +308,7 @@ public class CharSelectionInfo extends L2GameServerPacket
 		charInfopackage.setX(chardata.getInt("x"));
 		charInfopackage.setY(chardata.getInt("y"));
 		charInfopackage.setZ(chardata.getInt("z"));
-
+		
 		if (Config.L2JMOD_MULTILANG_ENABLE)
 		{
 			String lang = chardata.getString("language");
@@ -337,9 +316,9 @@ public class CharSelectionInfo extends L2GameServerPacket
 				lang = Config.L2JMOD_MULTILANG_DEFAULT;
 			charInfopackage.setHtmlPrefix("data/lang/" + lang + "/");
 		}
-
+		
 		// if is in subclass, load subclass exp, sp, lvl info
-		if(baseClassId != activeClassId)
+		if (baseClassId != activeClassId)
 			loadCharacterSubclassInfo(charInfopackage, objectId, activeClassId);
 		
 		charInfopackage.setClassId(activeClassId);
@@ -354,9 +333,9 @@ public class CharSelectionInfo extends L2GameServerPacket
 		if (cursedWeaponId > 0)
 		{
 			// cursed weapon transformations
-			if(cursedWeaponId == 8190)
+			if (cursedWeaponId == 8190)
 				charInfopackage.setTransformId(301);
-			else if(cursedWeaponId == 8689)
+			else if (cursedWeaponId == 8689)
 				charInfopackage.setTransformId(302);
 			else
 				charInfopackage.setTransformId(0);
@@ -370,38 +349,30 @@ public class CharSelectionInfo extends L2GameServerPacket
 		
 		if (weaponObjId > 0)
 		{
-			Connection con = null;
-			try
+			try (Connection con = L2DatabaseFactory.getInstance().getConnection())
 			{
-				con = L2DatabaseFactory.getInstance().getConnection();
-				PreparedStatement statement = con.prepareStatement("SELECT augAttributes FROM item_attributes WHERE itemId=?");
-				statement.setInt(1, weaponObjId);
-				ResultSet result = statement.executeQuery();
-				if (result.next())
+				try (PreparedStatement statement = con.prepareStatement("SELECT augAttributes FROM item_attributes WHERE itemId=?"))
 				{
-					int augment = result.getInt("augAttributes");
-					charInfopackage.setAugmentationId(augment == -1 ? 0 : augment);
+					statement.setInt(1, weaponObjId);
+					try (ResultSet result = statement.executeQuery())
+					{
+						if (result.next())
+						{
+							int augment = result.getInt("augAttributes");
+							charInfopackage.setAugmentationId(augment == -1 ? 0 : augment);
+						}
+						
+					}
 				}
-				
-				result.close();
-				statement.close();
 			}
 			catch (Exception e)
 			{
 				_log.log(Level.WARNING, "Could not restore augmentation info: " + e.getMessage(), e);
 			}
-			finally
-			{
-				L2DatabaseFactory.close(con);
-			}
 		}
 		
 		/*
-		 * Check if the base class is set to zero and alse doesn't match
-		 * with the current active class, otherwise send the base class ID.
-		 *
-		 * This prevents chars created before base class was introduced
-		 * from being displayed incorrectly.
+		 * Check if the base class is set to zero and alse doesn't match with the current active class, otherwise send the base class ID. This prevents chars created before base class was introduced from being displayed incorrectly.
 		 */
 		if (baseClassId == 0 && activeClassId > 0)
 			charInfopackage.setBaseClassId(activeClassId);
@@ -412,10 +383,4 @@ public class CharSelectionInfo extends L2GameServerPacket
 		charInfopackage.setLastAccess(chardata.getLong("lastAccess"));
 		return charInfopackage;
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__09_CHARSELECTINFO;
-	}
 }

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

@@ -16,13 +16,11 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 public final class ChooseInventoryItem extends L2GameServerPacket
 {
-	private static final String _S__6F_CHOOSEINVENTORYITEM = "[S] 7c ChooseInventoryItem";
-	
-	private int _itemId;
+	private final int _itemId;
 	
 	public ChooseInventoryItem(int itemId)
 	{
-		_itemId=itemId;
+		_itemId = itemId;
 	}
 	
 	@Override
@@ -31,10 +29,4 @@ public final class ChooseInventoryItem extends L2GameServerPacket
 		writeC(0x7c);
 		writeD(_itemId);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__6F_CHOOSEINVENTORYITEM;
-	}
 }

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

@@ -18,7 +18,6 @@ import com.l2jserver.gameserver.GameTimeController;
 
 public class ClientSetTime extends L2GameServerPacket
 {
-	private static final String _S__EC_CLIENTSETTIME = "[S] f2 ClientSetTime [dd]";
 	public static final ClientSetTime STATIC_PACKET = new ClientSetTime();
 	
 	private ClientSetTime()
@@ -30,12 +29,6 @@ public class ClientSetTime extends L2GameServerPacket
 	{
 		writeC(0xf2);
 		writeD(GameTimeController.getInstance().getGameTime()); // time in client minutes
-		writeD(6); //constant to match the server time( this determines the speed of the client clock)
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__EC_CLIENTSETTIME;
+		writeD(6); // constant to match the server time( this determines the speed of the client clock)
 	}
 }

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

@@ -29,12 +29,10 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 
 /**
  * @author kombat
- * Format: cd d[d s/d/dd/ddd]
  */
 public class ConfirmDlg extends L2GameServerPacket
 {
-	private static final String _S__ED_CONFIRMDLG = "[S] f3 ConfirmDlg";
-	private int _messageId;
+	private final int _messageId;
 	
 	private int _skillLvL = 1;
 	
@@ -87,11 +85,11 @@ public class ConfirmDlg extends L2GameServerPacket
 	public ConfirmDlg addCharName(L2Character cha)
 	{
 		if (cha instanceof L2Npc)
-			return addNpcName((L2Npc)cha);
+			return addNpcName((L2Npc) cha);
 		if (cha instanceof L2PcInstance)
-			return addPcName((L2PcInstance)cha);
+			return addPcName((L2PcInstance) cha);
 		if (cha instanceof L2Summon)
-			return addNpcName((L2Summon)cha);
+			return addNpcName((L2Summon) cha);
 		return addString(cha.getName());
 	}
 	
@@ -142,7 +140,12 @@ public class ConfirmDlg extends L2GameServerPacket
 	
 	public ConfirmDlg addZoneName(int x, int y, int z)
 	{
-		Integer[] coord = {x, y, z};
+		Integer[] coord =
+		{
+			x,
+			y,
+			z
+		};
 		_info.add(new CnfDlgData(TYPE_ZONE_NAME, coord));
 		return this;
 	}
@@ -154,7 +157,7 @@ public class ConfirmDlg extends L2GameServerPacket
 	
 	public ConfirmDlg addSkillName(L2Skill skill)
 	{
-		if (skill.getId() != skill.getDisplayId()) //custom skill -  need nameId or smth like this.
+		if (skill.getId() != skill.getDisplayId()) // custom skill - need nameId or smth like this.
 			return addString(skill.getName());
 		return addSkillName(skill.getId(), skill.getLevel());
 	}
@@ -199,6 +202,7 @@ public class ConfirmDlg extends L2GameServerPacket
 		{
 			writeD(_info.size());
 			
+			// TODO: Verify this i bet its same like SystemMessage
 			for (CnfDlgData data : _info)
 			{
 				writeD(data.type);
@@ -206,19 +210,19 @@ public class ConfirmDlg extends L2GameServerPacket
 				switch (data.type)
 				{
 					case TYPE_TEXT:
-						writeS((String)data.value);
+						writeS((String) data.value);
 						break;
 					case TYPE_NUMBER:
 					case TYPE_NPC_NAME:
 					case TYPE_ITEM_NAME:
-						writeD((Integer)data.value);
+						writeD((Integer) data.value);
 						break;
 					case TYPE_SKILL_NAME:
-						writeD((Integer)data.value); // Skill Id
+						writeD((Integer) data.value); // Skill Id
 						writeD(_skillLvL); // Skill lvl
 						break;
 					case TYPE_ZONE_NAME:
-						Integer[] array = (Integer[])data.value;
+						Integer[] array = (Integer[]) data.value;
 						writeD(array[0]);
 						writeD(array[1]);
 						writeD(array[2]);
@@ -226,15 +230,13 @@ public class ConfirmDlg extends L2GameServerPacket
 				}
 			}
 			if (_time != 0)
+			{
 				writeD(_time);
+			}
 			if (_requesterId != 0)
+			{
 				writeD(_requesterId);
+			}
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__ED_CONFIRMDLG;
-	}
 }

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

@@ -21,17 +21,10 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.NpcStringId;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
-/**
- * This class ...
- *
- * @version $Revision: 1.4.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public final class CreatureSay extends L2GameServerPacket
 {
-	// ddSS
-	private static final String _S__4A_CREATURESAY = "[S] 4A CreatureSay";
-	private int _objectId;
-	private int _textType;
+	private final int _objectId;
+	private final int _textType;
 	private String _charName = null;
 	private int _charId = 0;
 	private String _text = null;
@@ -94,21 +87,25 @@ public final class CreatureSay extends L2GameServerPacket
 		writeD(_objectId);
 		writeD(_textType);
 		if (_charName != null)
+		{
 			writeS(_charName);
+		}
 		else
+		{
 			writeD(_charId);
+		}
 		writeD(_npcString); // High Five NPCString ID
 		if (_text != null)
+		{
 			writeS(_text);
-		else
+		}
+		else if (_parameters != null)
 		{
-			if (_parameters != null)
+			for (String s : _parameters)
 			{
-				for (String s : _parameters)
-					writeS(s);
+				writeS(s);
 			}
 		}
-
 	}
 	
 	@Override
@@ -117,13 +114,7 @@ public final class CreatureSay extends L2GameServerPacket
 		L2PcInstance _pci = getClient().getActiveChar();
 		if (_pci != null)
 		{
-			_pci.broadcastSnoop(_textType,_charName,_text);
+			_pci.broadcastSnoop(_textType, _charName, _text);
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__4A_CREATURESAY;
-	}
 }

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

@@ -16,15 +16,8 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.L2Object;
 
-/**
- *
- * format  cdd
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- */
 public final class DeleteObject extends L2GameServerPacket
 {
-	private static final String _S__08_DELETEOBJECT = "[S] 08 DeleteObject";
 	private final int _objectId;
 	
 	public DeleteObject(L2Object obj)
@@ -42,12 +35,6 @@ public final class DeleteObject extends L2GameServerPacket
 	{
 		writeC(0x08);
 		writeD(_objectId);
-		writeD(0x00); //c2
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__08_DELETEOBJECT;
+		writeD(0x00); // c2
 	}
 }

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

@@ -14,24 +14,16 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
-/**
- * This class ...
- *
- * @version $Revision: 1.1.4.2 $ $Date: 2005/03/27 15:29:40 $
- */
 public class Dice extends L2GameServerPacket
 {
-	private static final String _S__D4_Dice = "[S] da Dice";
-	private int _charObjId;
-	private int _itemId;
-	private int _number;
-	private int _x;
-	private int _y;
-	private int _z;
+	private final int _charObjId;
+	private final int _itemId;
+	private final int _number;
+	private final int _x;
+	private final int _y;
+	private final int _z;
 	
 	/**
-	 * 0xd4 Dice         dddddd
 	 * @param charObjId
 	 * @param itemId
 	 * @param number
@@ -39,31 +31,25 @@ public class Dice extends L2GameServerPacket
 	 * @param y
 	 * @param z
 	 */
-	public Dice(int charObjId, int itemId, int number, int x , int y , int z)
+	public Dice(int charObjId, int itemId, int number, int x, int y, int z)
 	{
 		_charObjId = charObjId;
 		_itemId = itemId;
 		_number = number;
-		_x =x;
-		_y =y;
-		_z =z;
+		_x = x;
+		_y = y;
+		_z = z;
 	}
 	
 	@Override
 	protected final void writeImpl()
 	{
 		writeC(0xda);
-		writeD(_charObjId);  //object id of player
-		writeD(_itemId);     //	item id of dice (spade)  4625,4626,4627,4628
-		writeD(_number);      //number rolled
-		writeD(_x);       //x
-		writeD(_y);       //y
-		writeD(_z);     //z
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__D4_Dice;
+		writeD(_charObjId); // object id of player
+		writeD(_itemId); // item id of dice (spade) 4625,4626,4627,4628
+		writeD(_number); // number rolled
+		writeD(_x); // x
+		writeD(_y); // y
+		writeD(_z); // z
 	}
 }

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

@@ -32,22 +32,10 @@ import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
 
-/**
- * sample
- * 0b
- * 952a1048     objectId
- * 00000000 00000000 00000000 00000000 00000000 00000000
-
- * format  dddddd   rev 377
- * format  ddddddd   rev 417
- *
- * @version $Revision: 1.3.2.1.2.5 $ $Date: 2005/03/27 18:46:18 $
- */
 public class Die extends L2GameServerPacket
 {
-	private static final String _S__0B_DIE = "[S] 00 Die";
-	private int _charObjId;
-	private boolean _canTeleport;
+	private final int _charObjId;
+	private final boolean _canTeleport;
 	private boolean _sweepable;
 	private L2AccessLevel _access = AdminTable.getInstance().getAccessLevel(0);
 	private L2Clan _clan;
@@ -59,35 +47,26 @@ public class Die extends L2GameServerPacket
 	public Die(L2Character cha)
 	{
 		_activeChar = cha;
-		if (cha instanceof L2PcInstance) {
-			L2PcInstance player = (L2PcInstance)cha;
+		if (cha instanceof L2PcInstance)
+		{
+			L2PcInstance player = (L2PcInstance) cha;
 			_access = player.getAccessLevel();
-			_clan=player.getClan();
+			_clan = player.getClan();
 			
 		}
 		_charObjId = cha.getObjectId();
-		_canTeleport = !((cha instanceof L2PcInstance && TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_charObjId)) || cha.isPendingRevive());
+		_canTeleport = !((cha.isPlayer() && TvTEvent.isStarted() && TvTEvent.isPlayerParticipant(_charObjId)) || cha.isPendingRevive());
 		if (cha instanceof L2Attackable)
-			_sweepable = ((L2Attackable)cha).isSweepActive();
+			_sweepable = ((L2Attackable) cha).isSweepActive();
 		
 	}
 	
 	@Override
 	protected final void writeImpl()
 	{
-		
 		writeC(0x00);
-		
 		writeD(_charObjId);
-		// NOTE:
-		// 6d 00 00 00 00 - to nearest village
-		// 6d 01 00 00 00 - to hide away
-		// 6d 02 00 00 00 - to castle
-		// 6d 03 00 00 00 - to siege HQ
-		// sweepable
-		// 6d 04 00 00 00 - FIXED
-		
-		writeD(_canTeleport ? 0x01 : 0);                                                   // 6d 00 00 00 00 - to nearest village
+		writeD(_canTeleport ? 0x01 : 0);
 		if (_canTeleport && _clan != null && ZoneManager.getInstance().getZone(_activeChar, L2RespawnZone.class) == null)
 		{
 			boolean isInCastleDefense = false;
@@ -99,52 +78,46 @@ public class Die extends L2GameServerPacket
 			SiegableHall hall = CHSiegeManager.getInstance().getNearbyClanHall(_activeChar);
 			if (castle != null && castle.getSiege().getIsInProgress())
 			{
-				//siege in progress
+				// siege in progress
 				siegeClan = castle.getSiege().getAttackerClan(_clan);
-				if (siegeClan == null && castle.getSiege().checkIsDefender(_clan)){
+				if (siegeClan == null && castle.getSiege().checkIsDefender(_clan))
+				{
 					isInCastleDefense = true;
 				}
 			}
 			else if (fort != null && fort.getSiege().getIsInProgress())
 			{
-				//siege in progress
+				// siege in progress
 				siegeClan = fort.getSiege().getAttackerClan(_clan);
-				if (siegeClan == null && fort.getSiege().checkIsDefender(_clan)){
+				if (siegeClan == null && fort.getSiege().checkIsDefender(_clan))
+				{
 					isInFortDefense = true;
 				}
 			}
 			
-			writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00);            // 6d 01 00 00 00 - to hide away
-			writeD(_clan.getCastleId() > 0  ||
-					isInCastleDefense? 0x01 : 0x00);             		// 6d 02 00 00 00 - to castle
-			writeD((TerritoryWarManager.getInstance().getFlagForClan(_clan) != null)
-					|| (siegeClan != null && !isInCastleDefense && !isInFortDefense
-						&& !siegeClan.getFlag().isEmpty())
-						|| (hall != null && hall.getSiege().checkIsAttacker(_clan))? 0x01 : 0x00);       // 6d 03 00 00 00 - to siege HQ
-			writeD(_sweepable ? 0x01 : 0x00);                               // sweepable  (blue glow)
-			writeD(_access.allowFixedRes() ? 0x01: 0x00);                  // 6d 04 00 00 00 - to FIXED
-			writeD(_clan.getFortId() > 0  || isInFortDefense? 0x01 : 0x00);    // 6d 05 00 00 00 - to fortress
+			writeD(_clan.getHideoutId() > 0 ? 0x01 : 0x00); // 6d 01 00 00 00 - to hide away
+			writeD(_clan.getCastleId() > 0 || isInCastleDefense ? 0x01 : 0x00); // 6d 02 00 00 00 - to castle
+			writeD((TerritoryWarManager.getInstance().getFlagForClan(_clan) != null) || (siegeClan != null && !isInCastleDefense && !isInFortDefense && !siegeClan.getFlag().isEmpty()) || (hall != null && hall.getSiege().checkIsAttacker(_clan)) ? 0x01 : 0x00); // 6d 03 00 00 00 - to siege HQ
+			writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow)
+			writeD(_access.allowFixedRes() ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED
+			writeD(_clan.getFortId() > 0 || isInFortDefense ? 0x01 : 0x00); // 6d 05 00 00 00 - to fortress
 		}
 		else
 		{
-			writeD(0x00);                                               // 6d 01 00 00 00 - to hide away
-			writeD(0x00);                                               // 6d 02 00 00 00 - to castle
-			writeD(0x00);                                               // 6d 03 00 00 00 - to siege HQ
-			writeD(_sweepable ? 0x01 : 0x00);                               // sweepable  (blue glow)
-			writeD(_access.allowFixedRes() ? 0x01: 0x00);                  // 6d 04 00 00 00 - to FIXED
-			writeD(0x00);    // 6d 05 00 00 00 - to fortress
+			writeD(0x00); // 6d 01 00 00 00 - to hide away
+			writeD(0x00); // 6d 02 00 00 00 - to castle
+			writeD(0x00); // 6d 03 00 00 00 - to siege HQ
+			writeD(_sweepable ? 0x01 : 0x00); // sweepable (blue glow)
+			writeD(_access.allowFixedRes() ? 0x01 : 0x00); // 6d 04 00 00 00 - to FIXED
+			writeD(0x00); // 6d 05 00 00 00 - to fortress
 		}
-		//TODO: protocol 152
+		// TODO: protocol 152
+		//@formatter:off
 		/*
-        writeC(0); //show die animation
-        writeD(0); //agathion ress button
-        writeD(0); //additional free space
+		 * writeC(0); //show die animation 
+		 * writeD(0); //agathion ress button 
+		 * writeD(0); //additional free space
 		 */
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__0B_DIE;
+		//@formatter:on
 	}
 }

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

@@ -16,22 +16,8 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 
-/**
- * 60
- * d6 6d c0 4b		door id
- * 8f 14 00 00 		x
- * b7 f1 00 00 		y
- * 60 f2 ff ff 		z
- * 00 00 00 00 		??
- *
- * format  dddd    rev 377  ID:%d X:%d Y:%d Z:%d
- *         ddddd   rev 419
- *
- * @version $Revision: 1.3.2.2.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public final class DoorInfo extends L2GameServerPacket
 {
-	private static final String _S__60_DOORINFO = "[S] 4c DoorInfo";
 	private final L2DoorInstance _door;
 	
 	public DoorInfo(L2DoorInstance door)
@@ -46,10 +32,4 @@ public final class DoorInfo extends L2GameServerPacket
 		writeD(_door.getObjectId());
 		writeD(_door.getDoorId());
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__60_DOORINFO;
-	}
 }

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

@@ -16,27 +16,13 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 
-/**
- * 61
- * d6 6d c0 4b		door id
- * 8f 14 00 00 		x
- * b7 f1 00 00 		y
- * 60 f2 ff ff 		z
- * 00 00 00 00 		??
- *
- * format  dddd    rev 377  ID:%d X:%d Y:%d Z:%d
- *         ddddd   rev 419
- *
- * @version $Revision: 1.3.2.2.2.3 $ $Date: 2005/03/27 15:29:57 $
- */
 public final class DoorStatusUpdate extends L2GameServerPacket
 {
-	private static final String _S__61_DOORSTATUSUPDATE = "[S] 4d DoorStatusUpdate";
-	private L2DoorInstance _door;
+	private final L2DoorInstance _door;
 	
 	public DoorStatusUpdate(L2DoorInstance door)
 	{
-		_door=door;
+		_door = door;
 	}
 	
 	@Override
@@ -48,13 +34,7 @@ public final class DoorStatusUpdate extends L2GameServerPacket
 		writeD(_door.getDamage());
 		writeD(_door.isEnemy() ? 1 : 0);
 		writeD(_door.getDoorId());
-		writeD((int)_door.getCurrentHp());
+		writeD((int) _door.getCurrentHp());
 		writeD(_door.getMaxVisibleHp());
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__61_DOORSTATUSUPDATE;
-	}
 }

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

@@ -16,25 +16,8 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
-/**
- * 16
- * d6 6d c0 4b		player id who dropped it
- * ee cc 11 43 		object id
- * 39 00 00 00 		item id
- * 8f 14 00 00 		x
- * b7 f1 00 00 		y
- * 60 f2 ff ff 		z
- * 01 00 00 00 		show item-count 1=yes
- * 7a 00 00 00      count                                         .
- *
- * format  dddddddd    rev 377
- *         ddddddddd   rev 417
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- */
 public class DropItem extends L2GameServerPacket
 {
-	private static final String _S__16_DROPITEM = "[S] 16 DropItem";
 	private final L2ItemInstance _item;
 	private final int _charObjId;
 	
@@ -45,7 +28,7 @@ public class DropItem extends L2GameServerPacket
 	 */
 	public DropItem(L2ItemInstance item, int playerObjId)
 	{
-		_item=item;
+		_item = item;
 		_charObjId = playerObjId;
 	}
 	
@@ -61,22 +44,9 @@ public class DropItem extends L2GameServerPacket
 		writeD(_item.getY());
 		writeD(_item.getZ());
 		// only show item count if it is a stackable item
-		if (_item.isStackable())
-		{
-			writeD(0x01);
-		}
-		else
-		{
-			writeD(0x00);
-		}
+		writeD(_item.isStackable() ? 0x01 : 0x00);
 		writeQ(_item.getCount());
 		
-		writeD(1); // unknown
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__16_DROPITEM;
+		writeD(0x01); // unknown
 	}
 }

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

@@ -14,18 +14,13 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-/**
- * format   dddddd
- *
- */
 public class Earthquake extends L2GameServerPacket
 {
-	private static final String _S__C4_EARTHQUAKE = "[S] d3 Earthquake";
-	private int _x;
-	private int _y;
-	private int _z;
-	private int _intensity;
-	private int _duration;
+	private final int _x;
+	private final int _y;
+	private final int _z;
+	private final int _intensity;
+	private final int _duration;
 	
 	/**
 	 * @param x
@@ -46,18 +41,12 @@ public class Earthquake extends L2GameServerPacket
 	@Override
 	protected final void writeImpl()
 	{
-		writeC(0xd3);
+		writeC(0xD3);
 		writeD(_x);
 		writeD(_y);
 		writeD(_z);
 		writeD(_intensity);
 		writeD(_duration);
-		writeD(0x00);       // Unknown
-	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__C4_EARTHQUAKE;
+		writeD(0x00); // Unknown
 	}
 }

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

@@ -16,11 +16,9 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 public class EnchantResult extends L2GameServerPacket
 {
-	private static final String _S__87_ENCHANTRESULT = "[S] 87 EnchantResult";
-	
-	private int _result;
-	private int _crystal;
-	private int _count;
+	private final int _result;
+	private final int _crystal;
+	private final int _count;
 	
 	public EnchantResult(int result, int crystal, int count)
 	{
@@ -37,10 +35,4 @@ public class EnchantResult extends L2GameServerPacket
 		writeD(_crystal);
 		writeQ(_count);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__87_ENCHANTRESULT;
-	}
 }

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

@@ -14,49 +14,13 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.items.L2Item;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
-
-/**
- * 5e
- * 01 00 00 00 		01 - added ?  02 - modified
- * 7b 86 73 42      object id
- * 08 00 00 00      body slot
- *
- *
- *
- * body slot
- * 0000  ?? underwear
- * 0001  ear
- * 0002  ear
- * 0003  neck
- * 0004  finger   (magic ring)
- * 0005  finger   (magic ring)
- * 0006  head     (l.cap)
- * 0007  r.hand   (dagger)
- * 0008  l.hand   (arrows)
- * 0009  hands    (short gloves)
- * 000a  chest    (squire shirt)
- * 000b  legs     (squire pants)
- * 000c  feet
- * 000d  ?? back
- * 000e  lr.hand   (bow)
- *
- *
- *
- * format  ddd
- *
- * @version $Revision: 1.4.2.1.2.4 $ $Date: 2005/03/27 15:29:40 $
- */
 public final class EquipUpdate extends L2GameServerPacket
 {
-	private static final String _S__5E_EQUIPUPDATE = "[S] 4b EquipUpdate";
-	
-	private L2ItemInstance _item;
-	private int _change;
-	
+	private final L2ItemInstance _item;
+	private final int _change;
 	
 	public EquipUpdate(L2ItemInstance item, int change)
 	{
@@ -122,14 +86,6 @@ public final class EquipUpdate extends L2GameServerPacket
 				bodypart = 0x10;
 				break;
 		}
-		
-		if (Config.DEBUG) _log.fine("body:" +bodypart);
 		writeD(bodypart);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__5E_EQUIPUPDATE;
-	}
 }

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

@@ -18,17 +18,12 @@ import com.l2jserver.gameserver.model.CharEffectList;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-/* Packet format: F3 XX000000 YY000000 ZZ000000 */
-
 /**
- *
- * @author  Luca Baldi
+ * @author Luca Baldi
  */
 public class EtcStatusUpdate extends L2GameServerPacket
 {
-	private static final String _S__F3_ETCSTATUSUPDATE = "[S] f9 EtcStatusUpdate";
-	
-	private L2PcInstance _activeChar;
+	private final L2PcInstance _activeChar;
 	
 	public EtcStatusUpdate(L2PcInstance activeChar)
 	{
@@ -52,13 +47,4 @@ public class EtcStatusUpdate extends L2GameServerPacket
 		writeD(_activeChar.getDeathPenaltyBuffLevel()); // 1-15 death penalty, lvl (combat ability decreased due to death)
 		writeD(_activeChar.getSouls());
 	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__F3_ETCSTATUSUPDATE;
-	}
 }

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

@@ -15,13 +15,10 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * 
  * @author mrTJO
  */
 public class Ex2ndPasswordAck extends L2GameServerPacket
 {
-	
-	private static final String _S__FE_10B_EX2NDPASSWORDACKPACKET = "[S] FE:10B Ex2NDPasswordAckPacket";
 	int _response;
 	
 	public static int SUCCESS = 0x00;
@@ -36,19 +33,10 @@ public class Ex2ndPasswordAck extends L2GameServerPacket
 	protected void writeImpl()
 	{
 		writeC(0xFE);
-		//writeH(0x109);
-		writeH(0xe7);
+		// writeH(0x109); GOD
+		writeH(0xE7);
 		writeC(0x00);
-		if (_response == WRONG_PATTERN)
-			writeD(0x01);
-		else
-			writeD(0x00);
+		writeD(_response == WRONG_PATTERN ? 0x01 : 0x00);
 		writeD(0x00);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_10B_EX2NDPASSWORDACKPACKET;
-	}
 }

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

@@ -15,21 +15,15 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format (ch)dd
- * d: window type
- * d: ban user (1)
- * 
  * @author mrTJO
  */
 public class Ex2ndPasswordCheck extends L2GameServerPacket
 {
-	private static final String _S__FE_109_EX2NDPASSWORDCHECKPACKET = "[S] FE:109 Ex2NDPasswordCheckPacket";
-	
 	public static final int PASSWORD_NEW = 0x00;
 	public static final int PASSWORD_PROMPT = 0x01;
 	public static final int PASSWORD_OK = 0x02;
 	
-	int _windowType;
+	private final int _windowType;
 	
 	public Ex2ndPasswordCheck(int windowType)
 	{
@@ -40,15 +34,9 @@ public class Ex2ndPasswordCheck extends L2GameServerPacket
 	protected void writeImpl()
 	{
 		writeC(0xFE);
-		//writeH(0x109);
+		// writeH(0x109); GOD
 		writeH(0xe5);
 		writeD(_windowType);
 		writeD(0x00);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_109_EX2NDPASSWORDCHECKPACKET;
-	}
 }

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

@@ -15,18 +15,15 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * 
  * @author mrTJO
  */
 public class Ex2ndPasswordVerify extends L2GameServerPacket
 {
-	private static final String _S__FE_10A_EX2NDPASSWORDVERIFYPACKET = "[S] FE:10A Ex2NDPasswordVerifyPacket";
-	
 	public static final int PASSWORD_OK = 0x00;
 	public static final int PASSWORD_WRONG = 0x01;
 	public static final int PASSWORD_BAN = 0x02;
 	
-	int _wrongTentatives, _mode;
+	private final int _wrongTentatives, _mode;
 	
 	public Ex2ndPasswordVerify(int mode, int wrongTentatives)
 	{
@@ -38,15 +35,9 @@ public class Ex2ndPasswordVerify extends L2GameServerPacket
 	protected void writeImpl()
 	{
 		writeC(0xFE);
-		//writeH(0x109);
+		// writeH(0x109); GOD
 		writeH(0xe6);
 		writeD(_mode);
 		writeD(_wrongTentatives);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_10A_EX2NDPASSWORDVERIFYPACKET;
-	}
 }

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

@@ -17,9 +17,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.actor.instance.L2AirShipInstance;
 
 public class ExAirShipInfo extends L2GameServerPacket
-{
-	private static final String _S__FE_60_EXAIRSHIPINFO = "[S] FE:60 ExAirShipInfo";
-	
+{	
 	// store some parameters, because they can be changed during broadcast
 	private final L2AirShipInstance _ship;
 	private final int _x, _y, _z, _heading, _moveSpeed, _rotationSpeed, _captain, _helm;
@@ -55,6 +53,7 @@ public class ExAirShipInfo extends L2GameServerPacket
 		writeD(_helm);
 		if (_helm != 0)
 		{
+			// TODO: unhardcode these!
 			writeD(0x16e); // Controller X
 			writeD(0x00); // Controller Y
 			writeD(0x6b); // Controller Z
@@ -75,10 +74,4 @@ public class ExAirShipInfo extends L2GameServerPacket
 		writeD(_ship.getFuel());
 		writeD(_ship.getMaxFuel());
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_60_EXAIRSHIPINFO;
-	}
 }

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

@@ -19,12 +19,9 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 public class ExAirShipStopMove extends L2GameServerPacket
 {
-	
-	private static final String _S__FE_66_EXAIRSHIPSTOPMOVE = "[S] FE:66 ExAirShipStopMove";
-	
 	private final int _playerId, _airShipId, _x, _y, _z;
 	
-	public ExAirShipStopMove (L2PcInstance player, L2AirShipInstance ship, int x, int y, int z)
+	public ExAirShipStopMove(L2PcInstance player, L2AirShipInstance ship, int x, int y, int z)
 	{
 		_playerId = player.getObjectId();
 		_airShipId = ship.getObjectId();
@@ -45,10 +42,4 @@ public class ExAirShipStopMove extends L2GameServerPacket
 		writeD(_y);
 		writeD(_z);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_66_EXAIRSHIPSTOPMOVE;
-	}
 }

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

@@ -18,11 +18,9 @@ import com.l2jserver.gameserver.model.VehiclePathPoint;
 
 public class ExAirShipTeleportList extends L2GameServerPacket
 {
-	private static final String _S__FE_9A_EXAIRSHIPTELEPORTLIST = "[S] FE:9A ExAirShipTeleportList";
-	
-	private int _dockId;
-	private VehiclePathPoint[][] _teleports;
-	private int[] _fuelConsumption;
+	private final int _dockId;
+	private final VehiclePathPoint[][] _teleports;
+	private final int[] _fuelConsumption;
 	
 	public ExAirShipTeleportList(int dockId, VehiclePathPoint[][] teleports, int[] fuelConsumption)
 	{
@@ -58,10 +56,4 @@ public class ExAirShipTeleportList extends L2GameServerPacket
 		else
 			writeD(0);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_9A_EXAIRSHIPTELEPORTLIST;
-	}
 }

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

@@ -16,13 +16,11 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * @author JIV
- *
  */
 public class ExAskCoupleAction extends L2GameServerPacket
 {
-	private static final String _S__3D_SOCIALACTION = "[S] FE:BB ExAskCoupleAction";
-	private int _charObjId;
-	private int _actionId;
+	private final int _charObjId;
+	private final int _actionId;
 	
 	public ExAskCoupleAction(int charObjId, int social)
 	{
@@ -38,10 +36,4 @@ public class ExAskCoupleAction extends L2GameServerPacket
 		writeD(_actionId);
 		writeD(_charObjId);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__3D_SOCIALACTION;
-	}
 }

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

@@ -16,14 +16,11 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * Asks the player to join a CC
- * @author  chris_00
+ * @author chris_00
  */
 public class ExAskJoinMPCC extends L2GameServerPacket
 {
-	
-	private static final String _S__FE_27_EXASKJOINMPCC = "[S] FE:1a ExAskJoinMPCC";
-	
-	private String _requestorName;
+	private final String _requestorName;
 	
 	/**
 	 * @param requestorName
@@ -38,13 +35,7 @@ public class ExAskJoinMPCC extends L2GameServerPacket
 	{
 		writeC(0xFE);
 		writeH(0x1a);
-		writeS(_requestorName);  // name of CCLeader
+		writeS(_requestorName); // name of CCLeader
 		
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_27_EXASKJOINMPCC;
-	}
 }

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

@@ -15,21 +15,17 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format: ch S
- * @author  KenM
+ * @author KenM
  */
 public class ExAskJoinPartyRoom extends L2GameServerPacket
 {
-	private static final String _S__FE_34_EXASKJOINPARTYROOM = "[S] FE:35 ExAskJoinPartyRoom";
-	private String _charName;
-	
+	private final String _charName;
 	
 	public ExAskJoinPartyRoom(String charName)
 	{
 		_charName = charName;
 	}
 	
-	
 	@Override
 	protected void writeImpl()
 	{
@@ -37,14 +33,4 @@ public class ExAskJoinPartyRoom extends L2GameServerPacket
 		writeH(0x35);
 		writeS(_charName);
 	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__FE_34_EXASKJOINPARTYROOM;
-	}
-	
 }

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

@@ -16,12 +16,9 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * @author JIV
- *
  */
 public class ExAskModifyPartyLooting extends L2GameServerPacket
 {
-	private static final String _S__FE_BF_EXASKMODIFYPARTYLOOTING = "[S] FE:BF ExAskModifyPartyLooting";
-	
 	private final String _requestor;
 	private final byte _mode;
 	
@@ -39,11 +36,4 @@ public class ExAskModifyPartyLooting extends L2GameServerPacket
 		writeS(_requestor);
 		writeD(_mode);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_BF_EXASKMODIFYPARTYLOOTING;
-	}
-	
 }

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

@@ -16,11 +16,9 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 public class ExAttributeEnchantResult extends L2GameServerPacket
 {
-	private static final String _S__FE_61_EXATTRIBUTEENCHANTRESULT = "[S] FE:61 ExAttributeEnchantResult [d]";
+	private final int _result;
 	
-	private int _result;
-	
-	public ExAttributeEnchantResult (int result)
+	public ExAttributeEnchantResult(int result)
 	{
 		_result = result;
 	}
@@ -33,10 +31,4 @@ public class ExAttributeEnchantResult extends L2GameServerPacket
 		
 		writeD(_result);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_61_EXATTRIBUTEENCHANTRESULT;
-	}
 }

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

@@ -14,19 +14,12 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-/**
- * This class ...
- *
- * @version $Revision: 1.3.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
- */
 public class ExAutoSoulShot extends L2GameServerPacket
 {
-	private static final String _S__FE_12_EXAUTOSOULSHOT = "[S] FE:0c ExAutoSoulShot";
-	private int _itemId;
-	private int _type;
+	private final int _itemId;
+	private final int _type;
 	
 	/**
-	 * 0xfe:0x12 ExAutoSoulShot (ch)dd
 	 * @param itemId
 	 * @param type
 	 */
@@ -40,14 +33,8 @@ public class ExAutoSoulShot extends L2GameServerPacket
 	protected final void writeImpl()
 	{
 		writeC(0xFE);
-		writeH(0x0c);     // sub id
+		writeH(0x0c); // sub id
 		writeD(_itemId);
 		writeD(_type);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_12_EXAUTOSOULSHOT;
-	}
 }

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

@@ -16,14 +16,11 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * @author JIV
- *
  */
 public class ExBaseAttributeCancelResult extends L2GameServerPacket
 {
-	private static final String TYPE = "[S] FE:75 ExBaseAttributeCancelResult";
-	
-	private int _objId;
-	private byte _attribute;
+	private final int _objId;
+	private final byte _attribute;
 	
 	public ExBaseAttributeCancelResult(int objId, byte attribute)
 	{
@@ -36,14 +33,8 @@ public class ExBaseAttributeCancelResult extends L2GameServerPacket
 	{
 		writeC(0xFE);
 		writeH(0x75);
-		writeD(1); // result
+		writeD(0x01); // result
 		writeD(_objId);
 		writeD(_attribute);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return TYPE;
-	}
 }

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

@@ -17,14 +17,49 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- *
- * @author  KenM
+ * @author KenM
  */
 public final class ExBasicActionList extends L2GameServerPacket
 {
-	private static final String _S__FE_5E_EXBASICACTIONLIST = "[S] FE:5F ExBasicActionList";
-	
-	public static final int[] _actionsOnTransform = {1,2,3,4,5,6,7,8,9,11,15,16,17,18,19,21,22,23,32,36,39,40,41,42,43,44,45,46,47,48,50,52,53,54,55,56,57,63,64,65,70,1000,1001,1003,1004,1005,1006,1007,1008,1009,1010,1011,1012,1013,1014,1015,1016,1017,1018,1019,1020,1021,1022,1023,1024,1025,1026,1027,1028,1029,1030,1031,1032,1033,1034,1035,1036,1037,1038,1039,1040,1041,1042,1043,1044,1045,1046,1047,1048,1049,1050,1051,1052,1053,1054,1055,1056,1057,1058,1059,1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080,1081,1082,1083,1084,1089,1090,1091,1092,1093,1094,1095,1096,1097,1098};
+	//@formatter:off
+	public static final int[] _actionsOnTransform =
+	{
+		1, 2, 3, 4,
+		5, 6, 7, 8,
+		9, 11, 15, 16,
+		17, 18, 19, 21,
+		22, 23, 32, 36,
+		39, 40, 41, 42,
+		43, 44, 45, 46,
+		47, 48, 50, 52,
+		53, 54, 55, 56,
+		57, 63, 64, 65,
+		70, 1000, 1001, 1003,
+		1004, 1005, 1006, 1007,
+		1008, 1009, 1010, 1011,
+		1012, 1013, 1014, 1015,
+		1016, 1017, 1018, 1019,
+		1020, 1021, 1022, 1023,
+		1024, 1025, 1026, 1027,
+		1028, 1029, 1030, 1031,
+		1032, 1033, 1034, 1035,
+		1036, 1037, 1038, 1039,
+		1040, 1041, 1042, 1043,
+		1044, 1045, 1046, 1047,
+		1048, 1049, 1050, 1051,
+		1052, 1053, 1054, 1055,
+		1056, 1057, 1058, 1059,
+		1060, 1061, 1062, 1063,
+		1064, 1065, 1066, 1067,
+		1068, 1069, 1070, 1071,
+		1072, 1073, 1074, 1075,
+		1076, 1077, 1078, 1079,
+		1080, 1081, 1082, 1083,
+		1084, 1089, 1090, 1091,
+		1092, 1093, 1094, 1095,
+		1096, 1097, 1098 
+	};
+	//@formatter:on
 	public static final int[] _defaultActionList;
 	
 	static
@@ -36,13 +71,19 @@ public final class ExBasicActionList extends L2GameServerPacket
 		int i;
 		
 		for (i = count1; i-- > 0;)
+		{
 			_defaultActionList[i] = i;
+		}
 		
 		for (i = count2; i-- > 0;)
+		{
 			_defaultActionList[count1 + i] = 1000 + i;
+		}
 		
 		for (i = count3; i-- > 0;)
+		{
 			_defaultActionList[count1 + count2 + i] = 5000 + i;
+		}
 	}
 	
 	private static final ExBasicActionList STATIC_PACKET_TRANSFORMED = new ExBasicActionList(_actionsOnTransform);
@@ -60,18 +101,6 @@ public final class ExBasicActionList extends L2GameServerPacket
 		_actionIds = actionIds;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__FE_5E_EXBASICACTIONLIST;
-	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-	 */
 	@Override
 	protected void writeImpl()
 	{

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

@@ -16,13 +16,10 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * @author Gnat
- * 
  **/
 
 public class ExBirthdayPopup extends L2GameServerPacket
 {
-	private static final String _S__FE_8F_EXBIRTHDAYPOPUP = "[S] FE:8F ExBirthdayPopup";
-	
 	public ExBirthdayPopup()
 	{
 	}
@@ -33,10 +30,4 @@ public class ExBirthdayPopup extends L2GameServerPacket
 		writeC(0xfe);
 		writeH(0x8f);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_8F_EXBIRTHDAYPOPUP;
-	}
 }

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

@@ -18,12 +18,11 @@ package com.l2jserver.gameserver.network.serverpackets;
  * Special event info packet.
  * @author Kerberos
  * @author mrTJO
- * Format: (ch)dddddddSS
  */
 public class ExBrBroadcastEventState extends L2GameServerPacket
 {
-	private int _eventId;
-	private int _eventState;
+	private final int _eventId;
+	private final int _eventState;
 	private int _param0;
 	private int _param1;
 	private int _param2;
@@ -72,10 +71,4 @@ public class ExBrBroadcastEventState extends L2GameServerPacket
 		writeS(_param5);
 		writeS(_param6);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return "[S] FE:BC ExBrBroadcastEventState".intern();
-	}
 }

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

@@ -15,16 +15,17 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Eva's Inferno event packet.
- * Format: (ch)dddd // time info params: type (1 - %, 2 - npcId), value (depending on type: for type 1 - % value; for type 2 - 20573-20575), state (0-1), endtime (only when type 2)
- *
+ * Eva's Inferno event packet. info params: <br>
+ * type (1 - %, 2 - npcId), <br>
+ * value (depending on type: for type 1 - % value; for type 2 - 20573-20575), <br>
+ * state (0-1), endtime (only when type 2)
  */
 public class ExBrBuffEventState extends L2GameServerPacket
 {
-	private int _type; // 1 - %, 2 - npcId
-	private int _value; // depending on type: for type 1 - % value; for type 2 - 20573-20575
-	private int _state; // 0-1
-	private int _endtime; // only when type 2 as unix time in seconds from 1970
+	private final int _type; // 1 - %, 2 - npcId
+	private final int _value; // depending on type: for type 1 - % value; for type 2 - 20573-20575
+	private final int _state; // 0-1
+	private final int _endtime; // only when type 2 as unix time in seconds from 1970
 	
 	public ExBrBuffEventState(int type, int value, int state, int endtime)
 	{
@@ -34,12 +35,6 @@ public class ExBrBuffEventState extends L2GameServerPacket
 		_endtime = endtime;
 	}
 	
-	@Override
-	public String getType()
-	{
-		return "[S] FE:DB ExBrBuffEventState";
-	}
-	
 	@Override
 	protected void writeImpl()
 	{

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

@@ -16,7 +16,6 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
  * @author Kerberos
  */
@@ -38,15 +37,9 @@ public class ExBrExtraUserInfo extends L2GameServerPacket
 		
 		writeC(0xFE);
 		writeH(0xDA);
-		writeD(_charObjId); //object ID of Player
-		writeD(_val);		// event effect id
-		//writeC(0x00);		// Event flag, added only if event is active
+		writeD(_charObjId); // object ID of Player
+		writeD(_val); // event effect id
+		// writeC(0x00); // Event flag, added only if event is active
 		
 	}
-	
-	@Override
-	public String getType()
-	{
-		return "[S] FE:DA ExBrExtraUSerInfo".intern();
-	}
 }

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

@@ -16,16 +16,14 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * Halloween rank list server packet.
- * 
- * Format: (ch)ddddd
  */
 public class ExBrLoadEventTopRankers extends L2GameServerPacket
 {
-	private int _eventId;
-	private int _day;
-	private int _count;
-	private int _bestScore;
-	private int _myScore;
+	private final int _eventId;
+	private final int _day;
+	private final int _count;
+	private final int _bestScore;
+	private final int _myScore;
 	
 	public ExBrLoadEventTopRankers(int eventId, int day, int count, int bestScore, int myScore)
 	{
@@ -48,10 +46,4 @@ public class ExBrLoadEventTopRankers extends L2GameServerPacket
 		writeD(_myScore);
 		
 	}
-	
-	@Override
-	public String getType()
-	{
-		return "[S] FE:BD ExBrLoadEventTopRankers".intern();
-	}
 }

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

@@ -14,14 +14,11 @@
  */
 package com.l2jserver.gameserver.network.serverpackets;
 
-
 /**
- * format: dc
- * @author  GodKratos
+ * @author GodKratos
  */
 public class ExBrPremiumState extends L2GameServerPacket
 {
-	private static final String _S__FE_D9_EXBRPREMIUMSTATE = "[S] FE:D9 ExBrPremiumState";
 	private final int _objId;
 	private final int _state;
 	
@@ -31,9 +28,6 @@ public class ExBrPremiumState extends L2GameServerPacket
 		_state = state;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-	 */
 	@Override
 	protected void writeImpl()
 	{
@@ -42,13 +36,4 @@ public class ExBrPremiumState extends L2GameServerPacket
 		writeD(_objId);
 		writeC(_state);
 	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__FE_D9_EXBRPREMIUMSTATE;
-	}
 }

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

@@ -24,14 +24,10 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
 /**
- * 
  * @author ShanSoft
- *
  */
 public class ExBuySellListPacket extends L2GameServerPacket
 {
-	private static final String _S__B7_ExBuySellListPacket = "[S] B7 ExBuySellListPacket";
-	
 	private final List<L2TradeItem> _buyList = new FastList<>();
 	private L2ItemInstance[] _sellList = null;
 	private L2ItemInstance[] _refundList = null;
@@ -129,16 +125,12 @@ public class ExBuySellListPacket extends L2GameServerPacket
 			}
 		}
 		else
+		{
 			writeH(0x00);
+		}
 		
 		writeC(_done ? 0x01 : 0x00);
 		
 		_buyList.clear();
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__B7_ExBuySellListPacket;
-	}
 }

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

@@ -15,32 +15,29 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- *
- * @author  KenM
+ * @author KenM
  */
 public class ExCaptureOrc extends L2GameServerPacket
 {
-	private static final String _S__FE_44_EXCAPTUREORC = "[S] FE:45 ExSearchOrc";
-	
 	private static final byte[] _test;
 	static
 	{
+		// TODO: Verify the data
+		//@formatter:off
 		_test = new byte[]
-		                 {
-				(byte) 0xE4 ,(byte) 0xAB ,(byte) 0x8E ,(byte) 0xC5 ,(byte) 0xE9 ,(byte) 0xF9 ,(byte) 0x86 ,(byte) 0x7B,
-				(byte) 0x9E ,(byte) 0x5D ,(byte) 0x83 ,(byte) 0x14 ,(byte) 0x05 ,(byte) 0xD4 ,(byte) 0x48 ,(byte) 0x01,
-				(byte) 0xCD ,(byte) 0xA2 ,(byte) 0x8D ,(byte) 0x90 ,(byte) 0x62 ,(byte) 0x8C ,(byte) 0xDA ,(byte) 0x32,
-				(byte) 0x7B ,(byte) 0x1B ,(byte) 0x87 ,(byte) 0x6D ,(byte) 0x08 ,(byte) 0xC4 ,(byte) 0xE1 ,(byte) 0x56,
-				(byte) 0x9B ,(byte) 0x3B ,(byte) 0xC3 ,(byte) 0x40 ,(byte) 0xDF ,(byte) 0xE8 ,(byte) 0xD7 ,(byte) 0xE1,
-				(byte) 0x98 ,(byte) 0x38 ,(byte) 0x1C ,(byte) 0xA5 ,(byte) 0x8E ,(byte) 0x45 ,(byte) 0x3F ,(byte) 0xF2,
-				(byte) 0x5E ,(byte) 0x1C ,(byte) 0x59 ,(byte) 0x8E ,(byte) 0x74 ,(byte) 0x01 ,(byte) 0x9E ,(byte) 0xC2,
-				(byte) 0x00 ,(byte) 0x95 ,(byte) 0xB0 ,(byte) 0x1D ,(byte) 0x87 ,(byte) 0xED ,(byte) 0x9C ,(byte) 0x8A
-		                 };
+		{
+			(byte) 0xE4 ,(byte) 0xAB ,(byte) 0x8E ,(byte) 0xC5 ,(byte) 0xE9 ,(byte) 0xF9 ,(byte) 0x86 ,(byte) 0x7B,
+			(byte) 0x9E ,(byte) 0x5D ,(byte) 0x83 ,(byte) 0x14 ,(byte) 0x05 ,(byte) 0xD4 ,(byte) 0x48 ,(byte) 0x01,
+			(byte) 0xCD ,(byte) 0xA2 ,(byte) 0x8D ,(byte) 0x90 ,(byte) 0x62 ,(byte) 0x8C ,(byte) 0xDA ,(byte) 0x32,
+			(byte) 0x7B ,(byte) 0x1B ,(byte) 0x87 ,(byte) 0x6D ,(byte) 0x08 ,(byte) 0xC4 ,(byte) 0xE1 ,(byte) 0x56,
+			(byte) 0x9B ,(byte) 0x3B ,(byte) 0xC3 ,(byte) 0x40 ,(byte) 0xDF ,(byte) 0xE8 ,(byte) 0xD7 ,(byte) 0xE1,
+			(byte) 0x98 ,(byte) 0x38 ,(byte) 0x1C ,(byte) 0xA5 ,(byte) 0x8E ,(byte) 0x45 ,(byte) 0x3F ,(byte) 0xF2,
+			(byte) 0x5E ,(byte) 0x1C ,(byte) 0x59 ,(byte) 0x8E ,(byte) 0x74 ,(byte) 0x01 ,(byte) 0x9E ,(byte) 0xC2,
+			(byte) 0x00 ,(byte) 0x95 ,(byte) 0xB0 ,(byte) 0x1D ,(byte) 0x87 ,(byte) 0xED ,(byte) 0x9C ,(byte) 0x8A
+		};
+		//@formatter:on
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-	 */
 	@Override
 	protected void writeImpl()
 	{
@@ -48,13 +45,4 @@ public class ExCaptureOrc extends L2GameServerPacket
 		writeH(0x45);
 		writeB(_test);
 	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__FE_44_EXCAPTUREORC;
-	}
 }

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

@@ -16,21 +16,18 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * @author JIV
- *
  */
 public class ExChangeNpcState extends L2GameServerPacket
 {
+	private final int _objId;
+	private final int _state;
+	
 	public ExChangeNpcState(int objId, int state)
 	{
 		_objId = objId;
 		_state = state;
 	}
 	
-	private static final String _S__FE_BE__EXCHANGENPCSTATE = "[S] FE:BE ExChangeNpcState";
-	
-	private final int _objId;
-	private final int _state;
-	
 	@Override
 	protected void writeImpl()
 	{
@@ -39,11 +36,4 @@ public class ExChangeNpcState extends L2GameServerPacket
 		writeD(_objId);
 		writeD(_state);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_BE__EXCHANGENPCSTATE;
-	}
-	
 }

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

@@ -19,11 +19,9 @@ package com.l2jserver.gameserver.network.serverpackets;
  */
 public class ExChangePostState extends L2GameServerPacket
 {
-	private static final String _S__FE_B3_EXCHANGEPOSTSTATE = "[S] B3 ExChangePostState";
-	
-	private boolean _receivedBoard;
-	private int[] _changedMsgIds;
-	private int _changeId;
+	private final boolean _receivedBoard;
+	private final int[] _changedMsgIds;
+	private final int _changeId;
 	
 	public ExChangePostState(boolean receivedBoard, int[] changedMsgIds, int changeId)
 	{
@@ -35,7 +33,10 @@ public class ExChangePostState extends L2GameServerPacket
 	public ExChangePostState(boolean receivedBoard, int changedMsgId, int changeId)
 	{
 		_receivedBoard = receivedBoard;
-		_changedMsgIds = new int[]{changedMsgId};
+		_changedMsgIds = new int[]
+		{
+			changedMsgId
+		};
 		_changeId = changeId;
 	}
 	
@@ -52,10 +53,4 @@ public class ExChangePostState extends L2GameServerPacket
 			writeD(_changeId); // state
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_B3_EXCHANGEPOSTSTATE;
-	}
 }

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

@@ -17,9 +17,8 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.Elementals;
 import com.l2jserver.gameserver.model.items.instance.L2ItemInstance;
 
-
 /**
- * @author  Kerberos
+ * @author Kerberos
  */
 public class ExChooseInventoryAttributeItem extends L2GameServerPacket
 {
@@ -32,7 +31,7 @@ public class ExChooseInventoryAttributeItem extends L2GameServerPacket
 		_itemId = item.getDisplayId();
 		_atribute = Elementals.getItemElement(_itemId);
 		if (_atribute == Elementals.NONE)
-			throw new IllegalArgumentException("Undefined Atribute item: "+ item);
+			throw new IllegalArgumentException("Undefined Atribute item: " + item);
 		_level = Elementals.getMaxElementLevel(_itemId);
 	}
 	
@@ -44,18 +43,12 @@ public class ExChooseInventoryAttributeItem extends L2GameServerPacket
 		writeD(_itemId);
 		// Structure for now
 		// Must be 0x01 for stone/crystal attribute type
-		writeD(_atribute == Elementals.FIRE ? 1 : 0);	// Fire
-		writeD(_atribute == Elementals.WATER ? 1 : 0);	// Water
-		writeD(_atribute == Elementals.WIND ? 1 : 0);	// Wind
-		writeD(_atribute == Elementals.EARTH ? 1 : 0);	// Earth
-		writeD(_atribute == Elementals.HOLY ? 1 : 0);	// Holy
-		writeD(_atribute == Elementals.DARK ? 1 : 0);	// Unholy
-		writeD(_level);	// Item max attribute level
-	}
-	
-	@Override
-	public final String getType()
-	{
-		return "[S] FE:62 ExChooseInventoryAttributeItem";
+		writeD(_atribute == Elementals.FIRE ? 1 : 0); // Fire
+		writeD(_atribute == Elementals.WATER ? 1 : 0); // Water
+		writeD(_atribute == Elementals.WIND ? 1 : 0); // Wind
+		writeD(_atribute == Elementals.EARTH ? 1 : 0); // Earth
+		writeD(_atribute == Elementals.HOLY ? 1 : 0); // Holy
+		writeD(_atribute == Elementals.DARK ? 1 : 0); // Unholy
+		writeD(_level); // Item max attribute level
 	}
 }

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

@@ -15,16 +15,14 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- *
- * @author  chris_00
- *
- * close the CommandChannel Information window
- *
+ * Close the CommandChannel Information window
+ * @author chris_00
  */
 public class ExCloseMPCC extends L2GameServerPacket
 {
-	
-	private static final String _S__FE_26_EXCLOSEMPCC = "[S] FE:13 ExCloseMPCC";
+	public ExCloseMPCC()
+	{
+	}
 	
 	@Override
 	protected void writeImpl()
@@ -32,10 +30,4 @@ public class ExCloseMPCC extends L2GameServerPacket
 		writeC(0xfe);
 		writeH(0x13);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_26_EXCLOSEMPCC;
-	}
 }

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

@@ -23,12 +23,6 @@ public class ExClosePartyRoom extends L2GameServerPacket
 	{
 	}
 	
-	@Override
-	public String getType()
-	{
-		return "[S] FE:09 ExClosePartyRoom";
-	}
-	
 	@Override
 	protected void writeImpl()
 	{

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

@@ -15,15 +15,10 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format: (ch)Sd
- * S: Character Name
- * d: Status
- * 
  * @author mrTJO & UnAfraid
  */
 public class ExConfirmAddingContact extends L2GameServerPacket
 {
-	private static final String _S__FE_D2_EXCONFIRMADDINGCONTACT = "[S] FE:D2 ExConfirmAddingContact";
 	private final String _charName;
 	private final boolean _added;
 	
@@ -41,10 +36,4 @@ public class ExConfirmAddingContact extends L2GameServerPacket
 		writeS(_charName);
 		writeD(_added ? 0x01 : 0x00);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_D2_EXCONFIRMADDINGCONTACT;
-	}
 }

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

@@ -17,23 +17,15 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- * Format: (chd) dddS
- * d: Always -1
- * d: Player Team
- * d: Player Object ID
- * S: Player Name
- * 
  * @author mrTJO
  */
 public class ExCubeGameAddPlayer extends L2GameServerPacket
 {
-	private static final String _S__FE_97_01_EXCUBEGAMEADDPLAYER = "[S] FE:97:01 ExCubeGameAddPlayer";
 	L2PcInstance _player;
 	boolean _isRedTeam;
 	
 	/**
 	 * Add Player To Minigame Waiting List
-	 * 
 	 * @param player Player Instance
 	 * @param isRedTeam Is Player from Red Team?
 	 */
@@ -56,10 +48,4 @@ public class ExCubeGameAddPlayer extends L2GameServerPacket
 		writeD(_player.getObjectId());
 		writeS(_player.getName());
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_97_01_EXCUBEGAMEADDPLAYER;
-	}
 }

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

@@ -15,23 +15,16 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format: (chd) ddd
- * d: Time Left
- * d: Blue Points
- * d: Red Points
- * 
  * @author mrTJO
  */
 public class ExCubeGameChangePoints extends L2GameServerPacket
 {
-	private static final String _S__FE_98_02_EXCUBEGAMECHANGEPOINTS = "[S] FE:98:02 ExCubeGameChangePoints";
 	int _timeLeft;
 	int _bluePoints;
 	int _redPoints;
 	
 	/**
 	 * Change Client Point Counter
-	 * 
 	 * @param timeLeft Time Left before Minigame's End
 	 * @param bluePoints Current Blue Team Points
 	 * @param redPoints Current Red Team Points
@@ -54,10 +47,4 @@ public class ExCubeGameChangePoints extends L2GameServerPacket
 		writeD(_bluePoints);
 		writeD(_redPoints);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_98_02_EXCUBEGAMECHANGEPOINTS;
-	}
 }

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

@@ -17,22 +17,15 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- * Format: (chd) ddd
- * d: Always -1
- * d: Origin Team
- * d: Destination Team
- * 
  * @author mrTJO
  */
 public class ExCubeGameChangeTeam extends L2GameServerPacket
 {
-	private static final String _S__FE_97_05_EXCUBEGAMECHANGETEAM = "[S] FE:97:05 ExCubeGameChangeTeam";
 	L2PcInstance _player;
 	boolean _fromRedTeam;
 	
 	/**
 	 * Move Player from Team x to Team y
-	 * 
 	 * @param player Player Instance
 	 * @param fromRedTeam Is Player from Red Team?
 	 */
@@ -53,10 +46,4 @@ public class ExCubeGameChangeTeam extends L2GameServerPacket
 		writeD(_fromRedTeam ? 0x01 : 0x00);
 		writeD(_fromRedTeam ? 0x00 : 0x01);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_97_05_EXCUBEGAMECHANGETEAM;
-	}
 }

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

@@ -15,19 +15,14 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format: (chd) d
- * d: Seconds Left
- * 
  * @author mrTJO
  */
 public class ExCubeGameChangeTimeToStart extends L2GameServerPacket
 {
-	private static final String _S__FE_97_03_EXCUBEGAMECHANGETIMETOSTART = "[S] FE:97:03 ExCubeGameChangeTimeToStart";
 	int _seconds;
 	
 	/**
 	 * Update Minigame Waiting List Time to Start
-	 * 
 	 * @param seconds
 	 */
 	public ExCubeGameChangeTimeToStart(int seconds)
@@ -44,10 +39,4 @@ public class ExCubeGameChangeTimeToStart extends L2GameServerPacket
 		
 		writeD(_seconds);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_97_03_EXCUBEGAMECHANGETIMETOSTART;
-	}
 }

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

@@ -15,15 +15,10 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format: (chd)
- * 
  * @author mrTJO
  */
 public class ExCubeGameCloseUI extends L2GameServerPacket
 {
-	private static final String _S__FE_97_FFFFFFFF_EXCUBEGAMECLOSEUI = "[S] FE:97:FFFFFFFF ExCubeGameCloseUI";
-	int _seconds;
-	
 	/**
 	 * Close Minigame Waiting List
 	 */
@@ -39,10 +34,4 @@ public class ExCubeGameCloseUI extends L2GameServerPacket
 		writeH(0x97);
 		writeD(0xffffffff);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_97_FFFFFFFF_EXCUBEGAMECLOSEUI;
-	}
 }

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

@@ -15,19 +15,15 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format: (chd) ddd
- * d: Winner Team
- * 
+ * *
  * @author mrTJO
  */
 public class ExCubeGameEnd extends L2GameServerPacket
 {
-	private static final String _S__FE_98_01_EXCUBEGAMEEND = "[S] FE:98:01 ExCubeGameEnd";
 	boolean _isRedTeamWin;
 	
 	/**
 	 * Show Minigame Results
-	 * 
 	 * @param isRedTeamWin Is Red Team Winner?
 	 */
 	public ExCubeGameEnd(boolean isRedTeamWin)
@@ -44,10 +40,4 @@ public class ExCubeGameEnd extends L2GameServerPacket
 		
 		writeD(_isRedTeamWin ? 0x01 : 0x00);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_98_01_EXCUBEGAMEEND;
-	}
 }

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

@@ -17,19 +17,10 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- * Format: (chd) dddddd
- * d: Time Left
- * d: Blue Points
- * d: Red Points
- * d: Player Team
- * d: Player Object ID
- * d: Player Points
- * 
  * @author mrTJO
  */
 public class ExCubeGameExtendedChangePoints extends L2GameServerPacket
 {
-	private static final String _S__FE_98_00_EXCUBEGAMEEXTENDEDCHANGEPOINTS = "[S] FE:98:00 ExCubeGameExtendedChangePoints";
 	int _timeLeft;
 	int _bluePoints;
 	int _redPoints;
@@ -39,7 +30,6 @@ public class ExCubeGameExtendedChangePoints extends L2GameServerPacket
 	
 	/**
 	 * Update a Secret Point Counter (used by client when receive ExCubeGameEnd)
-	 * 
 	 * @param timeLeft Time Left before Minigame's End
 	 * @param bluePoints Current Blue Team Points
 	 * @param redPoints Current Blue Team points
@@ -47,8 +37,7 @@ public class ExCubeGameExtendedChangePoints extends L2GameServerPacket
 	 * @param player Player Instance
 	 * @param playerPoints Current Player Points
 	 */
-	public ExCubeGameExtendedChangePoints(int timeLeft, int bluePoints, int redPoints,
-			boolean isRedTeam, L2PcInstance player, int playerPoints)
+	public ExCubeGameExtendedChangePoints(int timeLeft, int bluePoints, int redPoints, boolean isRedTeam, L2PcInstance player, int playerPoints)
 	{
 		_timeLeft = timeLeft;
 		_bluePoints = bluePoints;
@@ -73,10 +62,4 @@ public class ExCubeGameExtendedChangePoints extends L2GameServerPacket
 		writeD(_player.getObjectId());
 		writeD(_playerPoints);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_98_00_EXCUBEGAMEEXTENDEDCHANGEPOINTS;
-	}
 }

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

@@ -17,22 +17,15 @@ package com.l2jserver.gameserver.network.serverpackets;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
- * Format: (chd) ddd
- * d: Always -1
- * d: Player Team
- * d: Player Object ID
- * 
  * @author mrTJO
  */
 public class ExCubeGameRemovePlayer extends L2GameServerPacket
 {
-	private static final String _S__FE_97_02_EXCUBEGAMEREMOVEPLAYER = "[S] FE:97:02 ExCubeGameRemovePlayer";
 	L2PcInstance _player;
 	boolean _isRedTeam;
 	
 	/**
 	 * Remove Player from Minigame Waiting List
-	 * 
 	 * @param player Player to Remove
 	 * @param isRedTeam Is Player from Red Team?
 	 */
@@ -54,10 +47,4 @@ public class ExCubeGameRemovePlayer extends L2GameServerPacket
 		writeD(_isRedTeam ? 0x01 : 0x00);
 		writeD(_player.getObjectId());
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_97_02_EXCUBEGAMEREMOVEPLAYER;
-	}
 }

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

@@ -16,13 +16,10 @@ package com.l2jserver.gameserver.network.serverpackets;
 
 /**
  * Format: (chd)
- * 
  * @author mrTJO
  */
 public class ExCubeGameRequestReady extends L2GameServerPacket
 {
-	private static final String _S__FE_97_04_EXCUBEGAMEREQUESTREADY = "[S] FE:97:04 ExCubeGameRequestReady";
-	
 	/**
 	 * Show Confirm Dialog for 10 seconds
 	 */
@@ -38,10 +35,4 @@ public class ExCubeGameRequestReady extends L2GameServerPacket
 		writeH(0x97);
 		writeD(0x04);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_97_04_EXCUBEGAMEREQUESTREADY;
-	}
 }

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

@@ -18,28 +18,11 @@ import java.util.List;
 
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
-
 /**
- * Format: (chd) ddd[dS]d[dS]
- * d: unknown
- * d: always -1
- * d: blue players number
- * [
- * 		d: player object id
- * 		S: player name
- * ]
- * d: blue players number
- * [
- * 		d: player object id
- * 		S: player name
- * ]
- * 
  * @author mrTJO
  */
 public class ExCubeGameTeamList extends L2GameServerPacket
 {
-	private static final String _S__FE_97_00_EXCUBEGAMETEAMLIST = "[S] FE:97:00 ExCubeGameTeamList";
-	
 	// Players Lists
 	List<L2PcInstance> _bluePlayers;
 	List<L2PcInstance> _redPlayers;
@@ -48,9 +31,7 @@ public class ExCubeGameTeamList extends L2GameServerPacket
 	int _roomNumber;
 	
 	/**
-	 * 
 	 * Show Minigame Waiting List to Player
-	 * 
 	 * @param redPlayers Red Players List
 	 * @param bluePlayers Blue Players List
 	 * @param roomNumber Arena/Room ID
@@ -85,10 +66,4 @@ public class ExCubeGameTeamList extends L2GameServerPacket
 			writeS(player.getName());
 		}
 	}
-	
-	@Override
-	public String getType()
-	{
-		return _S__FE_97_00_EXCUBEGAMETEAMLIST;
-	}
 }

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

@@ -17,23 +17,17 @@ package com.l2jserver.gameserver.network.serverpackets;
 import java.util.List;
 
 /**
- * Format: (ch) d[d]
- *
- * @author  -Wooden-
+ * @author -Wooden-
  */
 public class ExCursedWeaponList extends L2GameServerPacket
 {
-	private static final String _S__FE_45_EXCURSEDWEAPONLIST = "[S] FE:46 ExCursedWeaponList";
-	private List<Integer> _cursedWeaponIds;
+	private final List<Integer> _cursedWeaponIds;
 	
 	public ExCursedWeaponList(List<Integer> cursedWeaponIds)
 	{
 		_cursedWeaponIds = cursedWeaponIds;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-	 */
 	@Override
 	protected void writeImpl()
 	{
@@ -46,14 +40,4 @@ public class ExCursedWeaponList extends L2GameServerPacket
 			writeD(i);
 		}
 	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__FE_45_EXCURSEDWEAPONLIST;
-	}
-	
 }

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

@@ -18,35 +18,29 @@ import java.util.List;
 
 import com.l2jserver.gameserver.util.Point3D;
 
-
 /**
  * Format: (ch) d[ddddd]
- *
- * @author  -Wooden-
+ * @author -Wooden-
  */
 public class ExCursedWeaponLocation extends L2GameServerPacket
 {
-	private static final String _S__FE_46_EXCURSEDWEAPONLOCATION = "[S] FE:47 ExCursedWeaponLocation";
-	private List<CursedWeaponInfo> _cursedWeaponInfo;
+	private final List<CursedWeaponInfo> _cursedWeaponInfo;
 	
 	public ExCursedWeaponLocation(List<CursedWeaponInfo> cursedWeaponInfo)
 	{
 		_cursedWeaponInfo = cursedWeaponInfo;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-	 */
 	@Override
 	protected void writeImpl()
 	{
 		writeC(0xfe);
 		writeH(0x47);
 		
-		if(!_cursedWeaponInfo.isEmpty())
+		if (!_cursedWeaponInfo.isEmpty())
 		{
 			writeD(_cursedWeaponInfo.size());
-			for(CursedWeaponInfo w : _cursedWeaponInfo)
+			for (CursedWeaponInfo w : _cursedWeaponInfo)
 			{
 				writeD(w.id);
 				writeD(w.activated);
@@ -63,20 +57,11 @@ public class ExCursedWeaponLocation extends L2GameServerPacket
 		}
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__FE_46_EXCURSEDWEAPONLOCATION;
-	}
-	
 	public static class CursedWeaponInfo
 	{
 		public Point3D pos;
 		public int id;
-		public int activated; //0 - not activated ? 1 - activated
+		public int activated; // 0 - not activated ? 1 - activated
 		
 		public CursedWeaponInfo(Point3D p, int ID, int status)
 		{

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

@@ -15,25 +15,15 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * @author JIV
- * 
  * Possibly trigger packet only, need to be verified.
- * 
+ * @author JIV
  */
 public class ExDominionWarEnd extends L2GameServerPacket
 {
-	private static final String TYPE = "[S] FE:A4 ExDominionWarEnd";
-	
 	@Override
 	protected void writeImpl()
 	{
 		writeC(0xFE);
 		writeH(0xA4);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return TYPE;
-	}
 }

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

@@ -19,16 +19,12 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 
 /**
  * @author JIV
- *
- * Structure: ddddd
  */
 public class ExDominionWarStart extends L2GameServerPacket
 {
-	private static final String TYPE = "[S] FE:A3 ExDominionWarStart";
-	
-	private int _objId;
-	private int _terId;
-	private boolean _isDisguised;
+	private final int _objId;
+	private final int _terId;
+	private final boolean _isDisguised;
 	
 	public ExDominionWarStart(L2PcInstance player)
 	{
@@ -43,15 +39,9 @@ public class ExDominionWarStart extends L2GameServerPacket
 		writeC(0xFE);
 		writeH(0xA3);
 		writeD(_objId);
-		writeD(1); //??
+		writeD(0x01); // ??
 		writeD(_terId);
 		writeD(_isDisguised ? 1 : 0);
 		writeD(_isDisguised ? _terId : 0);
 	}
-	
-	@Override
-	public String getType()
-	{
-		return TYPE;
-	}
 }

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

@@ -15,15 +15,12 @@
 package com.l2jserver.gameserver.network.serverpackets;
 
 /**
- * Format: ch Sd
- * @author  KenM
+ * @author KenM
  */
 public class ExDuelAskStart extends L2GameServerPacket
 {
-	private static final String _S__FE_4B_EXDUELASKSTART = "[S] FE:4c ExDuelAskStart";
-	
-	private String _requestorName;
-	private int _partyDuel;
+	private final String _requestorName;
+	private final int _partyDuel;
 	
 	public ExDuelAskStart(String requestor, int partyDuel)
 	{
@@ -31,9 +28,6 @@ public class ExDuelAskStart extends L2GameServerPacket
 		_partyDuel = partyDuel;
 	}
 	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
-	 */
 	@Override
 	protected void writeImpl()
 	{
@@ -43,14 +37,4 @@ public class ExDuelAskStart extends L2GameServerPacket
 		writeS(_requestorName);
 		writeD(_partyDuel);
 	}
-	
-	/**
-	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#getType()
-	 */
-	@Override
-	public String getType()
-	{
-		return _S__FE_4B_EXDUELASKSTART;
-	}
-	
 }