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

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

@@ -29 +29 @@
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 
@@ -56 +55 @@
         };
         
+        @Override
         public boolean useAdminCommand(String command, L2PcInstance activeChar)
         {
@@ -93 +93 @@
                                 if (player == null)
                                 {
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                                         return true;
                                 }
@@ -119 +119 @@
                                 if (player == null)
                                 {
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                                         return true;
                                 }
@@ -187 +187 @@
                                         return false;
                                 }
-                                IAdminCommandHandler ach = AdminCommandHandler.getInstance().getAdminCommandHandler(subCommand);
+                                IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
                                 ach.useAdminCommand(subCommand+command.substring(14), activeChar);
                         }
@@ -204 +204 @@
                                         return false;
                                 }
-                                IAdminCommandHandler ach = AdminCommandHandler.getInstance().getAdminCommandHandler(subCommand);
+                                IAdminCommandHandler ach = AdminCommandHandler.getInstance().getHandler(subCommand);
                                 ach.useAdminCommand(subCommand+command.substring(16), activeChar);
                         }
@@ -212 +212 @@
         }
         
+        @Override
         public String[] getAdminCommandList()
         {
@@ -248 +249 @@
                 else
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                 }
                 AdminHelpPage.showHelpPage(activeChar, filename);
@@ -270 +271 @@
                 else
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                         return;
                 }
                 if (player.getObjectId() == activeChar.getObjectId())
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.CANNOT_USE_ON_YOURSELF));
+                        player.sendPacket(SystemMessageId.CANNOT_USE_ON_YOURSELF);
                 else
                 {