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

trunk/L2J_DataPack/dist/game/data/scripts/teleports/Warpgate/Warpgate.java

@@ -22 +22 @@
 import com.l2jserver.gameserver.model.quest.Quest;
 import com.l2jserver.gameserver.model.quest.QuestState;
-import com.l2jserver.gameserver.model.quest.State;
 import com.l2jserver.gameserver.model.zone.L2ZoneType;
 
@@ -41 +40 @@
         {
                 if (player.isFlying())
+                {
                         return false;
+                }
                 
                 QuestState st;
@@ -47 +48 @@
                 {
                         st = player.getQuestState(PATH_TO_HELLBOUND);
-                        if (st != null && st.getState() == State.COMPLETED)
+                        if ((st != null) && st.isCompleted())
+                        {
                                 return true;
+                        }
                 }
                 
                 st = player.getQuestState(THATS_BLOODY_HOT);
-                if (st != null && st.getState() == State.COMPLETED)
+                if ((st != null) && st.isCompleted())
+                {
                         return true;
+                }
                 
                 return false;
@@ -64 +69 @@
                 {
                         if (HellboundManager.getInstance().isLocked())
+                        {
                                 return "warpgate-locked.htm";
+                        }
                 }
                 
@@ -74 +81 @@
         {
                 if (!canEnter(player))
+                {
                         return "warpgate-no.htm";
+                }
                 
                 player.teleToLocation(-11272, 236464, -3248, true);
+                HellboundManager.getInstance().unlock();
                 return null;
         }
@@ -85 +95 @@
                 if (character instanceof L2PcInstance)
                 {
-                        if (!canEnter((L2PcInstance)character) && !character.isGM())
+                        if (!canEnter((L2PcInstance) character) && !character.isGM())
+                        {
                                 ThreadPoolManager.getInstance().scheduleGeneral(new Teleport(character), 1000);
-                        else if (!((L2PcInstance)character).isMinimapAllowed())
+                        }
+                        else if (!((L2PcInstance) character).isMinimapAllowed())
                         {
                                 if (character.getInventory().getItemByItemId(MAP) != null)
-                                        ((L2PcInstance)character).setMinimapAllowed(true);
+                                {
+                                        ((L2PcInstance) character).setMinimapAllowed(true);
+                                }
                         }
                 }
@@ -96 +110 @@
         }
         
-        static final class Teleport implements Runnable
+        private static final class Teleport implements Runnable
         {
                 private final L2Character _char;
@@ -105 +119 @@
                 }
                 
+                @Override
                 public void run()
                 {