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

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

@@ -26 +26 @@
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 /**
@@ -47 +46 @@
         };
         
+        @Override
         public boolean useAdminCommand(String command, L2PcInstance activeChar)
         {
@@ -82 +82 @@
                                                 }
                                         }
-                                        else
-                                        {
-                                                kill(activeChar, plyr);
-                                        }
+                                        kill(activeChar, plyr);
                                 }
                                 else
@@ -114 +111 @@
                                 L2Object obj = activeChar.getTarget();
                                 if (obj instanceof L2ControllableMobInstance || !(obj instanceof L2Character))
-                                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                                 else
                                         kill(activeChar, (L2Character) obj);
@@ -152 +149 @@
         }
         
+        @Override
         public String[] getAdminCommandList()
         {