Browse Source

Making some packets static.

JIV 15 years ago
parent
commit
18dc065ad6
18 changed files with 56 additions and 23 deletions
  1. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/instancemanager/MailManager.java
  2. 3 3
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  3. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/network/L2GameClient.java
  4. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java
  5. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkill.java
  6. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java
  7. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillSafe.java
  8. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java
  9. 6 6
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestRestart.java
  10. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java
  11. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestPlayerShowMessage.java
  12. 8 0
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillResult.java
  13. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExMailArrived.java
  14. 8 1
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostArrived.java
  15. 8 1
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostSent.java
  16. 2 1
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/LeaveWorld.java
  17. 8 0
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/RestartResponse.java
  18. 1 0
      L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ServerClose.java

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/instancemanager/MailManager.java

@@ -213,7 +213,7 @@ public class MailManager
 
 
 		final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
 		final L2PcInstance receiver = L2World.getInstance().getPlayer(msg.getReceiverId());
 		if (receiver != null)
 		if (receiver != null)
-			receiver.sendPacket(new ExNoticePostArrived(true));
+			receiver.sendPacket(ExNoticePostArrived.valueOf(true));
 
 
 		ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msg.getId()), msg.getExpiration() - System.currentTimeMillis());
 		ThreadPoolManager.getInstance().scheduleGeneral(new MessageDeletionTask(msg.getId()), msg.getExpiration() - System.currentTimeMillis());
 	}
 	}

+ 3 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -4144,9 +4144,9 @@ public final class L2PcInstance extends L2Playable
 				if (!client.getConnection().isClosed())
 				if (!client.getConnection().isClosed())
 				{
 				{
 					if (closeClient)
 					if (closeClient)
-						client.close(new LeaveWorld());
+						client.close(LeaveWorld.STATIC_PACKET);
 					else
 					else
-						client.close(new ServerClose());
+						client.close(ServerClose.STATIC_PACKET);
 				}
 				}
 			}
 			}
 		}
 		}
@@ -4686,7 +4686,7 @@ public final class L2PcInstance extends L2Playable
             {
             {
                 GmListTable.broadcastMessageToGMs("Client "+client+" failed to reply GameGuard query and is being kicked!");
                 GmListTable.broadcastMessageToGMs("Client "+client+" failed to reply GameGuard query and is being kicked!");
                 _log.info("Client "+client+" failed to reply GameGuard query and is being kicked!");
                 _log.info("Client "+client+" failed to reply GameGuard query and is being kicked!");
-                client.close(new LeaveWorld());
+                client.close(LeaveWorld.STATIC_PACKET);
             }
             }
         }
         }
     }
     }

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/L2GameClient.java

@@ -573,7 +573,7 @@ public final class L2GameClient extends MMOClient<MMOConnection<L2GameClient>>
 
 
     public void closeNow()
     public void closeNow()
     {
     {
-    	super.getConnection().close(new ServerClose());
+    	super.getConnection().close(ServerClose.STATIC_PACKET);
     	cleanMe(true);
     	cleanMe(true);
     }
     }
     
     

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/EnterWorld.java

@@ -461,7 +461,7 @@ public class EnterWorld extends L2GameClientPacket
 		if (Config.ALLOW_MAIL)
 		if (Config.ALLOW_MAIL)
 		{
 		{
 			if (MailManager.getInstance().hasUnreadPost(activeChar))
 			if (MailManager.getInstance().hasUnreadPost(activeChar))
-				sendPacket(new ExNoticePostArrived(false));
+				sendPacket(ExNoticePostArrived.valueOf(false));
 		}
 		}
 
 
 		RegionBBSManager.getInstance().changeCommunityBoard();
 		RegionBBSManager.getInstance().changeCommunityBoard();

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

@@ -172,7 +172,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 					_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
 					_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
 				}
 				}
 
 
-				player.sendPacket(new ExEnchantSkillResult(true));
+				player.sendPacket(ExEnchantSkillResult.valueOf(true));
 
 
 				SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
 				SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
 				sm.addSkillName(_skillId);
 				sm.addSkillName(_skillId);
@@ -194,7 +194,7 @@ public final class RequestExEnchantSkill extends L2GameClientPacket
 					record.setLoggerName("skill");
 					record.setLoggerName("skill");
 					_logEnchant.log(record);
 					_logEnchant.log(record);
 				}
 				}
-				player.sendPacket(new ExEnchantSkillResult(false));
+				player.sendPacket(ExEnchantSkillResult.valueOf(false));
 			}
 			}
 			player.sendPacket(new UserInfo(player));
 			player.sendPacket(new UserInfo(player));
 			player.sendPacket(new ExBrExtraUserInfo(player));
 			player.sendPacket(new ExBrExtraUserInfo(player));

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillRouteChange.java

@@ -178,7 +178,7 @@ public final class RequestExEnchantSkillRouteChange extends L2GameClientPacket
 				}
 				}
 
 
 				player.addSkill(skill, true);
 				player.addSkill(skill, true);
-				player.sendPacket(new ExEnchantSkillResult(true));
+				player.sendPacket(ExEnchantSkillResult.valueOf(true));
 			}
 			}
 
 
 			if (Config.DEBUG)
 			if (Config.DEBUG)

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

@@ -161,7 +161,7 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 					_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
 					_log.fine("Learned skill ID: " + _skillId + " Level: " + _skillLvl + " for " + requiredSp + " SP, " + requireditems + " Adena.");
 				}
 				}
 
 
-				player.sendPacket(new ExEnchantSkillResult(true));
+				player.sendPacket(ExEnchantSkillResult.valueOf(true));
 
 
 				SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
 				SystemMessage sm = new SystemMessage(SystemMessageId.YOU_HAVE_SUCCEEDED_IN_ENCHANTING_THE_SKILL_S1);
 				sm.addSkillName(_skillId);
 				sm.addSkillName(_skillId);
@@ -183,7 +183,7 @@ public final class RequestExEnchantSkillSafe extends L2GameClientPacket
 				SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_S1_LEVEL_WILL_REMAIN);
 				SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_S1_LEVEL_WILL_REMAIN);
 				sm.addSkillName(_skillId);
 				sm.addSkillName(_skillId);
 				player.sendPacket(sm);
 				player.sendPacket(sm);
-				player.sendPacket(new ExEnchantSkillResult(false));
+				player.sendPacket(ExEnchantSkillResult.valueOf(false));
 			}
 			}
 			
 			
 			player.sendPacket(new UserInfo(player));
 			player.sendPacket(new UserInfo(player));

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExEnchantSkillUntrain.java

@@ -155,7 +155,7 @@ public final class RequestExEnchantSkillUntrain extends L2GameClientPacket
 		}
 		}
 
 
 		player.addSkill(skill, true);
 		player.addSkill(skill, true);
-		player.sendPacket(new ExEnchantSkillResult(true));
+		player.sendPacket(ExEnchantSkillResult.valueOf(true));
 		
 		
 		if (Config.DEBUG)
 		if (Config.DEBUG)
 		{
 		{

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

@@ -58,21 +58,21 @@ public final class RequestRestart extends L2GameClientPacket
 
 
 		if(player.getActiveEnchantItem() != null || player.getActiveEnchantAttrItem() != null)
 		if(player.getActiveEnchantItem() != null || player.getActiveEnchantAttrItem() != null)
 		{
 		{
-			sendPacket(new RestartResponse(false));
+			sendPacket(RestartResponse.valueOf(false));
 			return;
 			return;
 		}
 		}
 
 
 		if (player.isLocked())
 		if (player.isLocked())
 		{
 		{
 			_log.warning("Player " + player.getName() + " tried to restart during class change.");
 			_log.warning("Player " + player.getName() + " tried to restart during class change.");
-			sendPacket(new RestartResponse(false));
+			sendPacket(RestartResponse.valueOf(false));
 			return;
 			return;
 		}
 		}
 
 
 		if (player.getPrivateStoreType() != 0)
 		if (player.getPrivateStoreType() != 0)
 		{
 		{
 			player.sendMessage("Cannot restart while trading");
 			player.sendMessage("Cannot restart while trading");
-			sendPacket(new RestartResponse(false));
+			sendPacket(RestartResponse.valueOf(false));
 			return;
 			return;
 		}
 		}
 
 
@@ -88,7 +88,7 @@ public final class RequestRestart extends L2GameClientPacket
 				_log.fine("Player " + player.getName() + " tried to logout while fighting.");
 				_log.fine("Player " + player.getName() + " tried to logout while fighting.");
 
 
 			player.sendPacket(new SystemMessage(SystemMessageId.CANT_RESTART_WHILE_FIGHTING));
 			player.sendPacket(new SystemMessage(SystemMessageId.CANT_RESTART_WHILE_FIGHTING));
-			sendPacket(new RestartResponse(false));
+			sendPacket(RestartResponse.valueOf(false));
 			return;
 			return;
 		}
 		}
 
 
@@ -100,7 +100,7 @@ public final class RequestRestart extends L2GameClientPacket
 			if (SevenSignsFestival.getInstance().isFestivalInitialized())
 			if (SevenSignsFestival.getInstance().isFestivalInitialized())
 			{
 			{
 				player.sendMessage("You cannot restart while you are a participant in a festival.");
 				player.sendMessage("You cannot restart while you are a participant in a festival.");
-				sendPacket(new RestartResponse(false));
+				sendPacket(RestartResponse.valueOf(false));
 				return;
 				return;
 			}
 			}
 
 
@@ -126,7 +126,7 @@ public final class RequestRestart extends L2GameClientPacket
 		// return the client to the authed status
 		// return the client to the authed status
 		client.setState(GameClientState.AUTHED);
 		client.setState(GameClientState.AUTHED);
 
 
-		sendPacket(new RestartResponse(true));
+		sendPacket(RestartResponse.valueOf(true));
 
 
 		// send char list
 		// send char list
 		final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1);
 		final CharSelectionInfo cl = new CharSelectionInfo(client.getAccountName(), client.getSessionId().playOkID1);

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestSendPost.java

@@ -248,7 +248,7 @@ public final class RequestSendPost extends L2GameClientPacket
 		if (removeItems(activeChar, msg))
 		if (removeItems(activeChar, msg))
 		{
 		{
 			MailManager.getInstance().sendMessage(msg);
 			MailManager.getInstance().sendMessage(msg);
-			activeChar.sendPacket(new ExNoticePostSent(true));
+			activeChar.sendPacket(ExNoticePostSent.valueOf(true));
 			activeChar.sendPacket(new SystemMessage(SystemMessageId.MAIL_SUCCESSFULLY_SENT));
 			activeChar.sendPacket(new SystemMessage(SystemMessageId.MAIL_SUCCESSFULLY_SENT));
 		}
 		}
 	}
 	}

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/communityserver/readpackets/RequestPlayerShowMessage.java

@@ -48,7 +48,7 @@ public final class RequestPlayerShowMessage extends BaseReadPacket
 		switch(type)
 		switch(type)
 		{
 		{
 			case -1: // mail arraived
 			case -1: // mail arraived
-				player.sendPacket(new ExMailArrived());
+				player.sendPacket(ExMailArrived.STATIC_PACKET);
 				break;
 				break;
 			case 0: // text message
 			case 0: // text message
 				player.sendMessage(super.readS());
 				player.sendMessage(super.readS());

+ 8 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillResult.java

@@ -21,6 +21,14 @@ package com.l2jserver.gameserver.network.serverpackets;
  */
  */
 public class ExEnchantSkillResult extends L2GameServerPacket
 public class ExEnchantSkillResult extends L2GameServerPacket
 {
 {
+	private static final ExEnchantSkillResult STATIC_PACKET_TRUE = new ExEnchantSkillResult(true);
+	private static final ExEnchantSkillResult STATIC_PACKET_FALSE = new ExEnchantSkillResult(false);
+	
+	public static final ExEnchantSkillResult valueOf(boolean result)
+	{
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
 	private boolean _enchanted;
 	private boolean _enchanted;
 	
 	
 	public ExEnchantSkillResult(boolean enchanted)
 	public ExEnchantSkillResult(boolean enchanted)

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

@@ -23,6 +23,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 public class ExMailArrived extends L2GameServerPacket
 public class ExMailArrived extends L2GameServerPacket
 {
 {
 	private static final String _S__FE_2D_EXMAILARRIVED = "[S] FE:2e ExMailArrived";
 	private static final String _S__FE_2D_EXMAILARRIVED = "[S] FE:2e ExMailArrived";
+	public static final ExMailArrived STATIC_PACKET = new ExMailArrived();
 
 
 	/* (non-Javadoc)
 	/* (non-Javadoc)
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()
 	 * @see com.l2jserver.gameserver.serverpackets.ServerBasePacket#writeImpl()

+ 8 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostArrived.java

@@ -21,7 +21,14 @@ package com.l2jserver.gameserver.network.serverpackets;
 public class ExNoticePostArrived extends L2GameServerPacket
 public class ExNoticePostArrived extends L2GameServerPacket
 {
 {
 	private static final String _S__FE_A9_EXNOTICEPOSTARRIVED = "[S] A9 ExNoticePostArrived";
 	private static final String _S__FE_A9_EXNOTICEPOSTARRIVED = "[S] A9 ExNoticePostArrived";
-
+	private static final ExNoticePostArrived STATIC_PACKET_TRUE = new ExNoticePostArrived(true);
+	private static final ExNoticePostArrived STATIC_PACKET_FALSE = new ExNoticePostArrived(false);
+	
+	public static final ExNoticePostArrived valueOf(boolean result)
+	{
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
 	boolean _showAnim;
 	boolean _showAnim;
 
 
 	public ExNoticePostArrived(boolean showAnimation)
 	public ExNoticePostArrived(boolean showAnimation)

+ 8 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/ExNoticePostSent.java

@@ -20,7 +20,14 @@ package com.l2jserver.gameserver.network.serverpackets;
 public class ExNoticePostSent extends L2GameServerPacket
 public class ExNoticePostSent extends L2GameServerPacket
 {
 {
 	private static final String _S__FE_B4_EXNOTICEPOSTSENT = "[S] B4 ExNoticePostSent";
 	private static final String _S__FE_B4_EXNOTICEPOSTSENT = "[S] B4 ExNoticePostSent";
-
+	private static final ExNoticePostSent STATIC_PACKET_TRUE = new ExNoticePostSent(true);
+	private static final ExNoticePostSent STATIC_PACKET_FALSE = new ExNoticePostSent(false);
+	
+	public static final ExNoticePostSent valueOf(boolean result)
+	{
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
 	boolean _showAnim;
 	boolean _showAnim;
 
 
 	public ExNoticePostSent(boolean showAnimation)
 	public ExNoticePostSent(boolean showAnimation)

+ 2 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/LeaveWorld.java

@@ -21,7 +21,8 @@ package com.l2jserver.gameserver.network.serverpackets;
 public final class LeaveWorld extends L2GameServerPacket
 public final class LeaveWorld extends L2GameServerPacket
 {
 {
 	private static final String _S__96_LEAVEWORLD = "[S] 84 LeaveWorld";
 	private static final String _S__96_LEAVEWORLD = "[S] 84 LeaveWorld";
-
+	public static final LeaveWorld STATIC_PACKET = new LeaveWorld();
+	
 	@Override
 	@Override
 	protected final void writeImpl()
 	protected final void writeImpl()
 	{
 	{

+ 8 - 0
L2_GameServer/java/com/l2jserver/gameserver/network/serverpackets/RestartResponse.java

@@ -23,6 +23,14 @@ package com.l2jserver.gameserver.network.serverpackets;
 public final class RestartResponse extends L2GameServerPacket
 public final class RestartResponse extends L2GameServerPacket
 {
 {
 	private static final String _S__74_RESTARTRESPONSE = "[S] 71 RestartResponse";
 	private static final String _S__74_RESTARTRESPONSE = "[S] 71 RestartResponse";
+	private static final RestartResponse STATIC_PACKET_TRUE = new RestartResponse(true);
+	private static final RestartResponse STATIC_PACKET_FALSE = new RestartResponse(false);
+	
+	public static final RestartResponse valueOf(boolean result)
+	{
+		return result ? STATIC_PACKET_TRUE : STATIC_PACKET_FALSE;
+	}
+	
 	private boolean _result;
 	private boolean _result;
 
 
 	public RestartResponse(boolean result)
 	public RestartResponse(boolean result)

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

@@ -21,6 +21,7 @@ package com.l2jserver.gameserver.network.serverpackets;
 public class ServerClose extends L2GameServerPacket
 public class ServerClose extends L2GameServerPacket
 {
 {
 	private static final String _S__26_SERVERCLOSE = "[S] 20 ServerClose";
 	private static final String _S__26_SERVERCLOSE = "[S] 20 ServerClose";
+	public static final ServerClose STATIC_PACKET = new ServerClose();
 
 
 	/**
 	/**
 	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()
 	 * @see com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket#writeImpl()