Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.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/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java (modified) (8 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/quests/Q511_AwlUnderFoot/Q511_AwlUnderFoot.java

@@ -15 +15 @@
 package quests.Q511_AwlUnderFoot;
 
-import gnu.trove.TIntObjectHashMap;
+import gnu.trove.map.hash.TIntObjectHashMap;
 
 import com.l2jserver.gameserver.ThreadPoolManager;
@@ -31 +31 @@
 import com.l2jserver.gameserver.model.quest.State;
 import com.l2jserver.gameserver.network.SystemMessageId;
-import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.skills.SkillHolder;
 import com.l2jserver.gameserver.util.Util;
@@ -37 +36 @@
 
 /**
- * 
  * @author Gigiikun
- *
  */
 public final class Q511_AwlUnderFoot extends Quest
@@ -73 +70 @@
         }
         
-        private static final String qn = "Q511_AwlUnderFoot";
+        private static final String qn = "511_AwlUnderFoot";
         private static final boolean debug = false;
         private static final long REENTERTIME = 14400000;
@@ -128 +125 @@
                         if (!(world instanceof FAUWorld))
                         {
-                                player.sendPacket(SystemMessage.getSystemMessage(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER));
+                                player.sendPacket(SystemMessageId.ALREADY_ENTERED_ANOTHER_INSTANCE_CANT_ENTER);
                                 return "";
                         }
@@ -135 +132 @@
                 }
                 //New instance
+                if (ret != null)
+                {
+                        return ret;
+                }
+                ret = checkConditions(player);
+                if (ret != null)
+                        return ret;
+                L2Party party = player.getParty();
+                int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
+                Instance ins = InstanceManager.getInstance().getInstance(instanceId);
+                ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
+                world = new FAUWorld();
+                world.instanceId = instanceId;
+                world.templateId = dungeon.getInstanceId();
+                world.status = 0;
+                dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME);
+                InstanceManager.getInstance().addWorld(world);
+                _log.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
+                ThreadPoolManager.getInstance().scheduleGeneral(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY);
+
+                // teleport players
+                if (player.getParty() == null)
+                {
+                        teleportPlayer(player, coords, instanceId);
+                        world.allowed.add(player.getObjectId());
+                }
                 else
                 {
-                        if (ret != null)
-                                return ret;
-                        ret = checkConditions(player);
-                        if (ret != null)
-                                return ret;
-                        L2Party party = player.getParty();
-                        int instanceId = InstanceManager.getInstance().createDynamicInstance(template);
-                        Instance ins = InstanceManager.getInstance().getInstance(instanceId);
-                        ins.setSpawnLoc(new int[]{player.getX(),player.getY(),player.getZ()});
-                        world = new FAUWorld();
-                        world.instanceId = instanceId;
-                        world.templateId = dungeon.getInstanceId();
-                        world.status = 0;
-                        dungeon.setReEnterTime(System.currentTimeMillis() + REENTERTIME);
-                        InstanceManager.getInstance().addWorld(world);
-                        _log.info("Fortress AwlUnderFoot started " + template + " Instance: " + instanceId + " created by player: " + player.getName());
-                        ThreadPoolManager.getInstance().scheduleGeneral(new spawnRaid((FAUWorld) world), RAID_SPAWN_DELAY);
-
-                        // 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 getHtm(player.getHtmlPrefix(), "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
-                }
+                        for (L2PcInstance partyMember : party.getPartyMembers())
+                        {
+                                teleportPlayer(partyMember, coords, instanceId);
+                                world.allowed.add(partyMember.getObjectId());
+                                if (partyMember.getQuestState(qn) == null)
+                                        newQuestState(partyMember);
+                        }
+                }
+                return getHtm(player.getHtmlPrefix(), "FortressWarden-08.htm").replace("%clan%", player.getClan().getName());
         }
         
@@ -184 +180 @@
                 }
                 
+                @Override
                 public void run()
                 {
@@ -300 +297 @@
                                 {
                                         htmltext = "FortressWarden-14.htm";
-                                        st.takeItems(DL_MARK,count);
+                                        st.takeItems(DL_MARK, -1);
                                         st.rewardItems(KNIGHT_EPALUETTE, count);
                                 }