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

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

@@ -15 +15 @@
 package handlers.admincommandhandlers;
 
+import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;
@@ -47 +48 @@
 import com.l2jserver.util.StringUtil;
 
-
 /**
  * This class handles following admin commands: - show_spawns = shows menu -
@@ -57 +57 @@
 public class AdminSpawn implements IAdminCommandHandler
 {
+        private static final Logger _log = Logger.getLogger(AdminSpawn.class.getName());
         
         private static final String[] ADMIN_COMMANDS =
@@ -80 +81 @@
                 "admin_spawn_debug_print_menu"
         };
-        public static Logger _log = Logger.getLogger(AdminSpawn.class.getName());
-        
+        
+        @Override
         public boolean useAdminCommand(String command, L2PcInstance activeChar)
         {
@@ -286 +287 @@
                                 {
                                         params[1] = params[1].replace('_', ' ');
-                                        npcId = NpcTable.getInstance().getTemplateByName(params[1]).npcId;
+                                        npcId = NpcTable.getInstance().getTemplateByName(params[1]).getNpcId();
                                 }
                                 if (params.length > 2)
@@ -303 +304 @@
         }
         
+        @Override
         public String[] getAdminCommandList()
         {
@@ -370 +372 @@
                         // TODO add checks for GrandBossSpawnManager
                         if (RaidBossSpawnManager.getInstance().isDefined(spawn.getNpcid()))
-                                activeChar.sendMessage("You cannot spawn another instance of " + template1.name + ".");
+                                activeChar.sendMessage("You cannot spawn another instance of " + template1.getName() + ".");
                         else
                         {
@@ -377 +379 @@
                                         spawn.setRespawnMinDelay(43200);
                                         spawn.setRespawnMaxDelay(129600);
-                                        RaidBossSpawnManager.getInstance().addNewSpawn(spawn, 0, template1.baseHpMax, template1.baseMpMax, permanent);
+                                        RaidBossSpawnManager.getInstance().addNewSpawn(spawn, 0, template1.getBaseHpMax(), template1.getBaseMpMax(), permanent);
                                 }
                                 else
@@ -386 +388 @@
                                 if (!permanent)
                                         spawn.stopRespawn();
-                                activeChar.sendMessage("Created " + template1.name + " on " + target.getObjectId());
+                                activeChar.sendMessage("Created " + template1.getName() + " on " + target.getObjectId());
                         }
                 }
                 catch (Exception e)
                 {
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.TARGET_CANT_FOUND));
+                        activeChar.sendPacket(SystemMessageId.TARGET_CANT_FOUND);
                 }
         }
@@ -397 +399 @@
         private void showMonsters(L2PcInstance activeChar, int level, int from)
         {
-                L2NpcTemplate[] mobs = NpcTable.getInstance().getAllMonstersOfLevel(level);
-                final StringBuilder tb = StringUtil.startAppend(500 + mobs.length * 80,
+                final List<L2NpcTemplate> mobs = NpcTable.getInstance().getAllMonstersOfLevel(level);
+                final int mobsCount = mobs.size();
+                final StringBuilder tb = StringUtil.startAppend(500 + mobsCount * 80,
                                 "<html><title>Spawn Monster:</title><body><p> Level : ",
                                 Integer.toString(level),
                                 "<br>Total Npc's : ",
-                                Integer.toString(mobs.length),
+                                Integer.toString(mobsCount),
                 "<br>");
                 
                 // Loop
                 int i = from;
-                for (int j = 0; i < mobs.length && j < 50; i++, j++)
-                        StringUtil.append(tb, "<a action=\"bypass -h admin_spawn_monster ", Integer.toString(mobs[i].npcId), "\">", mobs[i].name, "</a><br1>");
-                
-                if (i == mobs.length)
+                for (int j = 0; i < mobsCount && j < 50; i++, j++)
+                        StringUtil.append(tb, "<a action=\"bypass -h admin_spawn_monster ", Integer.toString(mobs.get(i).getNpcId()), "\">", mobs.get(i).getName(), "</a><br1>");
+                
+                if (i == mobsCount)
                         tb.append("<br><center><button value=\"Back\" action=\"bypass -h admin_show_spawns\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></center></body></html>");
                 else
@@ -420 +423 @@
         private void showNpcs(L2PcInstance activeChar, String starting, int from)
         {
-                L2NpcTemplate[] mobs = NpcTable.getInstance().getAllNpcStartingWith(starting);
-                final StringBuilder tb = StringUtil.startAppend(500 + mobs.length * 80,
+                final List<L2NpcTemplate> mobs = NpcTable.getInstance().getAllNpcStartingWith(starting);
+                final int mobsCount = mobs.size();
+                final StringBuilder tb = StringUtil.startAppend(500 + mobsCount * 80,
                                 "<html><title>Spawn Monster:</title><body><p> There are ",
-                                Integer.toString(mobs.length),
+                                Integer.toString(mobsCount),
                                 " Npcs whose name starts with ",
                                 starting,
@@ -430 +434 @@
                 // Loop
                 int i = from;
-                for (int j = 0; i < mobs.length && j < 50; i++, j++)
-                        StringUtil.append(tb, "<a action=\"bypass -h admin_spawn_monster ", Integer.toString(mobs[i].npcId), "\">", mobs[i].name, "</a><br1>");
-                
-                if (i == mobs.length)
+                for (int j = 0; i < mobsCount && j < 50; i++, j++)
+                        StringUtil.append(tb, "<a action=\"bypass -h admin_spawn_monster ", Integer.toString(mobs.get(i).getNpcId()), "\">", mobs.get(i).getName(), "</a><br1>");
+                
+                if (i == mobsCount)
                         tb.append("<br><center><button value=\"Back\" action=\"bypass -h admin_show_npcs\" width=40 height=15 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></center></body></html>");
                 else