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

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

@@ -24 +24 @@
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
-
 
 /**
@@ -45 +43 @@
         };
         
+        @Override
         public boolean useAdminCommand(String command, L2PcInstance activeChar)
         {
@@ -77 +76 @@
         }
         
+        @Override
         public String[] getAdminCommandList()
         {
@@ -90 +90 @@
                 else
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                         return;
                 }
@@ -113 +113 @@
                 else
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                         return false;
                 }
@@ -121 +121 @@
                         return false;
                 }
-                else
+                
+                String exp = st.nextToken();
+                String sp = st.nextToken();
+                long expval = 0;
+                int spval = 0;
+                try
                 {
-                        String exp = st.nextToken();
-                        String sp = st.nextToken();
-                        long expval = 0;
-                        int spval = 0;
-                        try
-                        {
-                                expval = Long.parseLong(exp);
-                                spval = Integer.parseInt(sp);
-                        }
-                        catch (Exception e)
-                        {
-                                return false;
-                        }
-                        if (expval != 0 || spval != 0)
-                        {
-                                //Common character information
-                                player.sendMessage("Admin is adding you " + expval + " xp and " + spval + " sp.");
-                                player.addExpAndSp(expval, spval);
-                                //Admin information
-                                activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
-                                if (Config.DEBUG)
-                                        _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + ".");
-                        }
+                        expval = Long.parseLong(exp);
+                        spval = Integer.parseInt(sp);
+                }
+                catch (Exception e)
+                {
+                        return false;
+                }
+                if (expval != 0 || spval != 0)
+                {
+                        //Common character information
+                        player.sendMessage("Admin is adding you " + expval + " xp and " + spval + " sp.");
+                        player.addExpAndSp(expval, spval);
+                        //Admin information
+                        activeChar.sendMessage("Added " + expval + " xp and " + spval + " sp to " + player.getName() + ".");
+                        if (Config.DEBUG)
+                                _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") added " + expval + " xp and " + spval + " sp to " + player.getObjectId() + ".");
                 }
                 return true;
@@ -160 +158 @@
                 else
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INCORRECT_TARGET));
+                        activeChar.sendPacket(SystemMessageId.INCORRECT_TARGET);
                         return false;
                 }
                 StringTokenizer st = new StringTokenizer(ExpSp);
                 if (st.countTokens() != 2)
+                {
                         return false;
-                else
+                }
+                
+                String exp = st.nextToken();
+                String sp = st.nextToken();
+                long expval = 0;
+                int spval = 0;
+                try
                 {
-                        String exp = st.nextToken();
-                        String sp = st.nextToken();
-                        long expval = 0;
-                        int spval = 0;
-                        try
-                        {
-                                expval = Long.parseLong(exp);
-                                spval = Integer.parseInt(sp);
-                        }
-                        catch (Exception e)
-                        {
-                                return false;
-                        }
-                        if (expval != 0 || spval != 0)
-                        {
-                                //Common character information
-                                player.sendMessage("Admin is removing you " + expval + " xp and " + spval + " sp.");
-                                player.removeExpAndSp(expval, spval);
-                                //Admin information
-                                activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + ".");
-                                if (Config.DEBUG)
-                                        _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + ".");
-                        }
+                        expval = Long.parseLong(exp);
+                        spval = Integer.parseInt(sp);
+                }
+                catch (Exception e)
+                {
+                        return false;
+                }
+                if (expval != 0 || spval != 0)
+                {
+                        //Common character information
+                        player.sendMessage("Admin is removing you " + expval + " xp and " + spval + " sp.");
+                        player.removeExpAndSp(expval, spval);
+                        //Admin information
+                        activeChar.sendMessage("Removed " + expval + " xp and " + spval + " sp from " + player.getName() + ".");
+                        if (Config.DEBUG)
+                                _log.fine("GM: " + activeChar.getName() + "(" + activeChar.getObjectId() + ") removed " + expval + " xp and " + spval + " sp from " + player.getObjectId() + ".");
                 }
                 return true;