Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java

Timestamp:

Jan 16, 2012 7:56:19 AM (4 months ago)

Author:

MELERIX

Message:

STABLE: Sync with BETA [8629]

Location:

trunk/L2J_DataPack

Files:

• . (modified) (1 prop)
• dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java (modified) (6 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/usercommandhandlers/ClanWarsList.java

@@ -44 +44 @@
          * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
          */
+        @Override
         public boolean useUserCommand(int id, L2PcInstance activeChar)
         {
@@ -68 +69 @@
                         {
                                 // Attack List
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLANS_YOU_DECLARED_WAR_ON));
+                                activeChar.sendPacket(SystemMessageId.CLANS_YOU_DECLARED_WAR_ON);
                                 statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan1=? and clan_id=clan2 and clan2 not in (select clan1 from clan_wars where clan2=?)");
                                 statement.setInt(1, clan.getClanId());
@@ -76 +77 @@
                         {
                                 // Under Attack List
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CLANS_THAT_HAVE_DECLARED_WAR_ON_YOU));
+                                activeChar.sendPacket(SystemMessageId.CLANS_THAT_HAVE_DECLARED_WAR_ON_YOU);
                                 statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan2=? and clan_id=clan1 and clan1 not in (select clan2 from clan_wars where clan1=?)");
                                 statement.setInt(1, clan.getClanId());
@@ -85 +86 @@
                         {
                                 // War List
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.WAR_LIST));
+                                activeChar.sendPacket(SystemMessageId.WAR_LIST);
                                 statement = con.prepareStatement("select clan_name,clan_id,ally_id,ally_name from clan_data,clan_wars where clan1=? and clan_id=clan2 and clan2 in (select clan1 from clan_wars where clan2=?)");
                                 statement.setInt(1, clan.getClanId());
@@ -115 +116 @@
                         }
                         
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FRIEND_LIST_FOOTER));
+                        activeChar.sendPacket(SystemMessageId.FRIEND_LIST_FOOTER);
                         
                         rset.close();
@@ -136 +137 @@
          * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
          */
+        @Override
         public int[] getUserCommandList()
         {