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

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

@@ -31 +31 @@
 import com.l2jserver.gameserver.datatables.NpcWalkerRoutesTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
+import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.datatables.TeleportLocationTable;
 import com.l2jserver.gameserver.handler.IAdminCommandHandler;
 import com.l2jserver.gameserver.instancemanager.Manager;
 import com.l2jserver.gameserver.instancemanager.QuestManager;
+import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.olympiad.Olympiad;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
 
@@ -87 +88 @@
         };
         
+        @Override
         public boolean useAdminCommand(String command, L2PcInstance activeChar)
         {
@@ -115 +117 @@
                         {
                                 activeChar.setSilenceMode(false);
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MESSAGE_ACCEPTANCE_MODE));
+                                activeChar.sendPacket(SystemMessageId.MESSAGE_ACCEPTANCE_MODE);
                         }
                         else
                         {
                                 activeChar.setSilenceMode(true);
-                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.MESSAGE_REFUSAL_MODE));
+                                activeChar.sendPacket(SystemMessageId.MESSAGE_REFUSAL_MODE);
                         }
                         AdminHelpPage.showHelpPage(activeChar,"gm_menu.htm");
@@ -246 +248 @@
                                         SkillTable.getInstance().reload();
                                         activeChar.sendMessage("All Skills have been reloaded");
+                                }
+                                else if (type.startsWith("npcId"))
+                                {
+                                        Integer npcId = Integer.parseInt(st.nextToken());
+                                        if (npcId != null)
+                                        {
+                                                NpcTable.getInstance().reloadNpc(npcId);
+                                                for (L2Spawn spawn : SpawnTable.getInstance().getSpawnTable())
+                                                        if (spawn != null && spawn.getNpcid() == npcId)
+                                                                        spawn.respawnNpc(spawn.getLastSpawn());
+                                                
+                                                activeChar.sendMessage("NPC " + npcId + " have been reloaded");
+                                        }
                                 }
                                 else if (type.equals("npc"))
@@ -360 +375 @@
         }
         
+        @Override
         public String[] getAdminCommandList()
         {
@@ -430 +446 @@
                 replyMSG.append("<tr><td width=140></td><td width=40></td><td width=40></td></tr>");
                 replyMSG.append("<tr><td><font color=\"00AA00\">Enchant:</font></td><td></td><td></td></tr>");
-                replyMSG.append("<tr><td><font color=\"LEVEL\">Enchant Weapon</font> = "
-                                + Config.ENCHANT_CHANCE_WEAPON
-                                + "</td><td><edit var=\"param5\" width=40 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setconfig EnchantChanceWeapon $param5\" width=40 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
-                replyMSG.append("<tr><td><font color=\"LEVEL\">Enchant Armor</font> = "
-                                + Config.ENCHANT_CHANCE_ARMOR
-                                + "</td><td><edit var=\"param6\" width=40 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setconfig EnchantChanceArmor $param6\" width=40 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
-                replyMSG.append("<tr><td><font color=\"LEVEL\">Enchant Jewelry</font> = "
-                                + Config.ENCHANT_CHANCE_JEWELRY
-                                + "</td><td><edit var=\"param7\" width=40 height=15></td><td><button value=\"Set\" action=\"bypass -h admin_setconfig EnchantChanceJewelry $param7\" width=40 height=25 back=\"L2UI_ct1.button_df\" fore=\"L2UI_ct1.button_df\"></td></tr>");
                 replyMSG.append("<tr><td><font color=\"LEVEL\">Enchant Element Stone</font> = "
                                 + Config.ENCHANT_CHANCE_ELEMENT_STONE