Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.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/admincommandhandlers/AdminPetition.java (modified) (8 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/handlers/admincommandhandlers/AdminPetition.java

@@ -20 +20 @@
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
@@ -26 +25 @@
  *
  * @author Tempy
- *
  */
 public class AdminPetition implements IAdminCommandHandler
@@ -40 +38 @@
         };
         
+        @Override
         public boolean useAdminCommand(String command, L2PcInstance activeChar)
         {
@@ -60 +59 @@
                         if (PetitionManager.getInstance().isPlayerInConsultation(activeChar))
                         {
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_ONE_ACTIVE_PETITION_AT_TIME));
+                                activeChar.sendPacket(SystemMessageId.ONLY_ONE_ACTIVE_PETITION_AT_TIME);
                                 return true;
                         }
@@ -66 +65 @@
                         if (PetitionManager.getInstance().isPetitionInProcess(petitionId))
                         {
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PETITION_UNDER_PROCESS));
+                                activeChar.sendPacket(SystemMessageId.PETITION_UNDER_PROCESS);
                                 return true;
                         }
                         
                         if (!PetitionManager.getInstance().acceptPetition(activeChar, petitionId))
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_UNDER_PETITION_CONSULTATION));
+                                activeChar.sendPacket(SystemMessageId.NOT_UNDER_PETITION_CONSULTATION);
                 }
                 else if (command.startsWith("admin_reject_petition"))
                 {
                         if (!PetitionManager.getInstance().rejectPetition(activeChar, petitionId))
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.FAILED_CANCEL_PETITION_TRY_LATER));
+                                activeChar.sendPacket(SystemMessageId.FAILED_CANCEL_PETITION_TRY_LATER);
                         PetitionManager.getInstance().sendPendingPetitionList(activeChar);
                 }
@@ -83 +82 @@
                         if (PetitionManager.getInstance().isPetitionInProcess())
                         {
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PETITION_UNDER_PROCESS));
+                                activeChar.sendPacket(SystemMessageId.PETITION_UNDER_PROCESS);
                                 return false;
                         }
@@ -96 +95 @@
                                 if (targetChar == null || !(targetChar instanceof L2PcInstance))
                                 {
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_IS_INCORRECT));
+                                        activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
                                         return false;
                                 }
@@ -115 +114 @@
         }
         
+        @Override
         public String[] getAdminCommandList()
         {