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

trunk/L2J_DataPack/dist/game/data/scripts/instances/SeedOfDestruction/Stage1.java

@@ -15 +15 @@
 package instances.SeedOfDestruction;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import java.io.File;
@@ -362 +362 @@
                 if (party == null)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+                        player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
                         return false;
                 }
@@ -368 +368 @@
                 if (channel == null)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_COMMAND_CHANNEL_CANT_ENTER));
+                        player.sendPacket(SystemMessageId.NOT_IN_COMMAND_CHANNEL_CANT_ENTER);
                         return false;
                 }
                 else if (channel.getChannelLeader() != player)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+                        player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
                         return false;
                 }
                 else if (channel.getMemberCount() < MIN_PLAYERS || channel.getMemberCount() > MAX_PLAYERS)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER));
+                        player.sendPacket(SystemMessageId.PARTY_EXCEEDED_THE_LIMIT_CANT_ENTER);
                         return false;
                 }
@@ -425 +425 @@
                         if (!(world instanceof SOD1World))
                         {
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+                                player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
                                 return 0;
                         }
@@ -432 +432 @@
                 }
                 //New instance
+                if (!checkConditions(player))
+                        return 0;
+                instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+                world = new SOD1World();
+                world.instanceId = instanceId;
+                world.status = 0;
+                InstanceManager.getInstance().addWorld(world);
+                spawnState((SOD1World)world);
+                for (L2DoorInstance door : InstanceManager.getInstance().getInstance(instanceId).getDoors())
+                        if (Util.contains(ATTACKABLE_DOORS, door.getDoorId()))
+                                door.setIsAttackableDoor(true);
+                _log.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+                // teleport players
+                if (player.getParty() == null || player.getParty().getCommandChannel() == null)
+                {
+                        teleportPlayer(player, coords, instanceId);
+                        world.allowed.add(player.getObjectId());
+                }
                 else
                 {
-                        if (!checkConditions(player))
-                                return 0;
-                        instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-                        world = new SOD1World();
-                        world.instanceId = instanceId;
-                        world.status = 0;
-                        InstanceManager.getInstance().addWorld(world);
-                        spawnState((SOD1World)world);
-                        for (L2DoorInstance door : InstanceManager.getInstance().getInstance(instanceId).getDoors())
-                                if (Util.contains(ATTACKABLE_DOORS, door.getDoorId()))
-                                        door.setIsAttackableDoor(true);
-                        _log.info("Seed of Destruction started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-                        // teleport players
-                        if (player.getParty() == null || player.getParty().getCommandChannel() == null)
-                        {
-                                teleportPlayer(player, coords, instanceId);
-                                world.allowed.add(player.getObjectId());
-                        }
-                        else
-                        {
-                                for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
-                                {
-                                        teleportPlayer(channelMember, coords, instanceId);
-                                        world.allowed.add(channelMember.getObjectId());
-                                }
-                        }
-                        return instanceId;
-                }
+                        for (L2PcInstance channelMember : player.getParty().getCommandChannel().getMembers())
+                        {
+                                teleportPlayer(channelMember, coords, instanceId);
+                                world.allowed.add(channelMember.getObjectId());
+                        }
+                }
+                return instanceId;
         }
 
@@ -623 +620 @@
 
                 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_RESTRICTED);
-                sm.addString(InstanceManager.getInstance().getInstanceIdName(INSTANCEID));
+                sm.addInstanceName(INSTANCEID);
 
                 // set instance reenter time for all allowed players