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

trunk/L2J_DataPack/dist/game/data/scripts/instances/Pailaka/PailakaSongOfIceAndFire.java

@@ -29 +29 @@
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.util.Rnd;
 
@@ -156 +155 @@
                         if (world.templateId != INSTANCE_ID)
                         {
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+                                player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
                                 return;
                         }
@@ -165 +164 @@
                 }
                 //New instance
-                else
-                {
-                        final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaSongOfIceAndFire.xml");
-                        
-                        world = new InstanceWorld();
-                        world.instanceId = instanceId;
-                        world.templateId = INSTANCE_ID;
-                        InstanceManager.getInstance().addWorld(world);
-                        
-                        world.allowed.add(player.getObjectId());
-                        teleportPlayer(player, TELEPORT, instanceId);
-                }
+                final int instanceId = InstanceManager.getInstance().createDynamicInstance("PailakaSongOfIceAndFire.xml");
+                
+                world = new InstanceWorld();
+                world.instanceId = instanceId;
+                world.templateId = INSTANCE_ID;
+                InstanceManager.getInstance().addWorld(world);
+                
+                world.allowed.add(player.getObjectId());
+                teleportPlayer(player, TELEPORT, instanceId);
                 
         }
@@ -287 +283 @@
                                                 if (cond > 1)
                                                         return "32497-00.htm";
-                                                else
-                                                        return "32497-03.htm";
+                                                return "32497-03.htm";
                                         case State.COMPLETED:
                                                 return "32497-07.htm";
@@ -297 +292 @@
                                 if (cond > 1)
                                         return "32500-00.htm";
-                                else
-                                        return "32500-01.htm";
+                                return "32500-01.htm";
                         case INSPECTOR:
                                 switch (st.getInt("cond"))
@@ -435 +429 @@
                 }
                 
+                @Override
                 public void run()
                 {