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

trunk/L2J_DataPack/dist/game/data/scripts/handlers/usercommandhandlers/InstanceZone.java

@@ -24 +24 @@
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 
-
 /**
- * 
  * @author nille02
  */
@@ -39 +37 @@
          * @see com.l2jserver.gameserver.handler.IUserCommandHandler#getUserCommandList()
          */
+        @Override
         public int[] getUserCommandList()
         {
@@ -47 +46 @@
          * @see com.l2jserver.gameserver.handler.IUserCommandHandler#useUserCommand(int, com.l2jserver.gameserver.model.actor.instance.L2PcInstance)
          */
+        @Override
         public boolean useUserCommand(int id, L2PcInstance activeChar)
         {
@@ -56 +56 @@
                 {
                         SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_CURRENTLY_INUSE_S1);
-                        sm.addString(InstanceManager.getInstance().getInstanceIdName(world.templateId));
+                        sm.addInstanceName(world.templateId);
                         activeChar.sendPacket(sm);
                 }
@@ -71 +71 @@
                                         {
                                                 firstMessage = false;
-                                                activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.INSTANCE_ZONE_TIME_LIMIT));
+                                                activeChar.sendPacket(SystemMessageId.INSTANCE_ZONE_TIME_LIMIT);
                                         }
                                         int hours = (int) (remainingTime / 3600);
                                         int minutes = (int) ((remainingTime%3600) / 60);
                                         SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.AVAILABLE_AFTER_S1_S2_HOURS_S3_MINUTES);
-                                        sm.addString(InstanceManager.getInstance().getInstanceIdName(instanceId));
+                                        sm.addInstanceName(instanceId);
                                         sm.addNumber(hours);
                                         sm.addNumber(minutes);
@@ -85 +85 @@
                         }
                 if (firstMessage)
-                        activeChar.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NO_INSTANCEZONE_TIME_LIMIT));
+                        activeChar.sendPacket(SystemMessageId.NO_INSTANCEZONE_TIME_LIMIT);
                 return true;
         }