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

trunk/L2J_DataPack/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java

@@ -140 +140 @@
                 if (party == null)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.NOT_IN_PARTY_CANT_ENTER));
+                        player.sendPacket(SystemMessageId.NOT_IN_PARTY_CANT_ENTER);
                         return false;
                 }
                 if (party.getLeader() != player)
                 {
-                        player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER));
+                        player.sendPacket(SystemMessageId.ONLY_PARTY_LEADER_CAN_ENTER);
                         return false;
                 }
@@ -192 +192 @@
                         if (!(world instanceof HSWorld))
                         {
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+                                player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
                                 return 0;
                         }
@@ -199 +199 @@
                 }
                 //New instance
+                if (!checkConditions(player))
+                        return 0;
+                L2Party party = player.getParty();
+                instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+                world = new HSWorld();
+                world.instanceId = instanceId;
+                world.templateId = INSTANCEID;
+                world.status = 0;
+                ((HSWorld)world).startTime = System.currentTimeMillis();
+                ((HSWorld)world).ptLeaderName = player.getName();
+                InstanceManager.getInstance().addWorld(world);
+                _log.info("Hall Of Suffering started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+                runTumors((HSWorld)world);
+                
+                // teleport players
+                if (player.getParty() == null)
+                {
+                        teleportPlayer(player, coords, instanceId);
+                        world.allowed.add(player.getObjectId());
+                }
                 else
                 {
-                        if (!checkConditions(player))
-                                return 0;
-                        L2Party party = player.getParty();
-                        instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-                        world = new HSWorld();
-                        world.instanceId = instanceId;
-                        world.templateId = INSTANCEID;
-                        world.status = 0;
-                        ((HSWorld)world).startTime = System.currentTimeMillis();
-                        ((HSWorld)world).ptLeaderName = player.getName();
-                        InstanceManager.getInstance().addWorld(world);
-                        _log.info("Hall Of Suffering started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-                        runTumors((HSWorld)world);
-                        
-                        // teleport players
-                        if (player.getParty() == null)
-                        {
-                                teleportPlayer(player, coords, instanceId);
-                                world.allowed.add(player.getObjectId());
-                        }
-                        else
-                        {
-                                for (L2PcInstance partyMember : party.getPartyMembers())
-                                {
-                                        teleportPlayer(partyMember, coords, instanceId);
-                                        world.allowed.add(partyMember.getObjectId());
-                                        if (partyMember.getQuestState(qn) == null)
-                                                newQuestState(partyMember);
-                                }
-                        }
-                        return instanceId;
-                }
+                        for (L2PcInstance partyMember : party.getPartyMembers())
+                        {
+                                teleportPlayer(partyMember, coords, instanceId);
+                                world.allowed.add(partyMember.getObjectId());
+                                if (partyMember.getQuestState(qn) == null)
+                                        newQuestState(partyMember);
+                        }
+                }
+                return instanceId;
         }
         
@@ -458 +455 @@
         public String onAttack (L2Npc npc, L2PcInstance attacker, int damage, boolean isPet, L2Skill skill)
         {
-                InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
+                final InstanceWorld tmpworld = InstanceManager.getInstance().getWorld(npc.getInstanceId());
                 if (tmpworld instanceof HSWorld)
                 {
-                        if (!((HSWorld)tmpworld).isBossesAttacked)
-                        {
-                                ((HSWorld) tmpworld).isBossesAttacked = true;
+                        final HSWorld world = (HSWorld) tmpworld;
+                        if (!world.isBossesAttacked)
+                        {
+                                world.isBossesAttacked = true;
                                 Calendar reenter = Calendar.getInstance();
                                 reenter.add(Calendar.HOUR, INSTANCEPENALTY);
                                 
                                 SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.INSTANT_ZONE_S1_RESTRICTED);
-                                sm.addString(InstanceManager.getInstance().getInstanceIdName(tmpworld.templateId));
+                                sm.addInstanceName(tmpworld.templateId);
                                 
                                 // set instance reenter time for all allowed players
@@ -485 +483 @@
                         else if (damage >= npc.getCurrentHp())
                         {
-                                if (((HSWorld)tmpworld).klanikus.isDead())
-                                {
-                                        ((HSWorld)tmpworld).klanikus.setIsDead(false);
-                                        ((HSWorld)tmpworld).klanikus.doDie(attacker);
-                                        ((HSWorld)tmpworld).klodekus.doDie(attacker);
+                                if (world.klanikus.isDead())
+                                {
+                                        world.klanikus.setIsDead(false);
+                                        world.klanikus.doDie(attacker);
+                                        world.klodekus.doDie(attacker);
                                 }
                                 else if (((HSWorld)tmpworld).klodekus.isDead())
                                 {
-                                        ((HSWorld)tmpworld).klodekus.setIsDead(false);
-                                        ((HSWorld)tmpworld).klodekus.doDie(attacker);
-                                        ((HSWorld)tmpworld).klanikus.doDie(attacker);
+                                        world.klodekus.setIsDead(false);
+                                        world.klodekus.doDie(attacker);
+                                        world.klanikus.doDie(attacker);
                                 }
                                 else