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

trunk/L2J_DataPack/dist/game/data/scripts/vehicles/AirShipGludioGracia/AirShipGludioGracia.java

@@ -31 +31 @@
 
 /**
- * 
  * @author DS
- *
  */
 public class AirShipGludioGracia extends Quest implements Runnable
 {
-        private static final int[] CONTROLLERS = {32607, 32609};
+        private static final int[] CONTROLLERS =
+        {
+                32607, 32609
+        };
         
         private static final int GLUDIO_DOCK_ID = 10;
@@ -49 +50 @@
                 new VehiclePathPoint(-151202, 252556, 231),
                 new VehiclePathPoint(-160403, 256144, 222),
-                new VehiclePathPoint(-167874, 256731, -509, 0, 41035) // teleport: x,y,z,speed=0,heading
+                new VehiclePathPoint(-167874, 256731, -509, 0, 41035)
+        // teleport: x,y,z,speed=0,heading
         };
         
@@ -81 +83 @@
                 new VehiclePathPoint(-169763, 254815, 282),
                 new VehiclePathPoint(-168067, 256626, 343),
-                new VehiclePathPoint(-157261, 255664, 221, 0, 64781) // teleport: x,y,z,speed=0,heading
+                new VehiclePathPoint(-157261, 255664, 221, 0, 64781)
+        // teleport: x,y,z,speed=0,heading
         };
         
         private static final VehiclePathPoint[] WARPGATE_TO_GLUDIO =
         {
-                new VehiclePathPoint(-153414, 255385, 221),
-                new VehiclePathPoint(-149548, 258172, 221),
-                new VehiclePathPoint(-146884, 257097, 221),
-                new VehiclePathPoint(-146672, 254239, 221),
-                new VehiclePathPoint(-147855, 252712, 206),
-                new VehiclePathPoint(-149378, 252552, 198)
+                new VehiclePathPoint(-153414, 255385, 221), new VehiclePathPoint(-149548, 258172, 221), new VehiclePathPoint(-146884, 257097, 221), new VehiclePathPoint(-146672, 254239, 221), new VehiclePathPoint(-147855, 252712, 206), new VehiclePathPoint(-149378, 252552, 198)
         };
         
@@ -110 +108 @@
                         return null;
                 }
-                if (player.isParalyzed())
+                else if (player.isParalyzed())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_PETRIFIED);
                         return null;
                 }
-                if (player.isDead() || player.isFakeDeath())
-                {
-                        player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_DEAD);      
-                        return null;
-                }
-                if (player.isFishing())
+                else if (player.isDead() || player.isFakeDeath())
+                {
+                        player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_DEAD);
+                        return null;
+                }
+                else if (player.isFishing())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_FISHING);
                         return null;
                 }
-                if (player.isInCombat())
+                else if (player.isInCombat())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_IN_BATTLE);
                         return null;
                 }
-                if (player.isInDuel())
+                else if (player.isInDuel())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_IN_A_DUEL);
                         return null;
                 }
-                if (player.isSitting())
+                else if (player.isSitting())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_SITTING);
                         return null;
                 }
-                if (player.isCastingNow())
+                else if (player.isCastingNow())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_CASTING);
                         return null;
                 }
-                if (player.isCursedWeaponEquipped())
+                else if (player.isCursedWeaponEquipped())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_CURSED_WEAPON_IS_EQUIPPED);
                         return null;
                 }
-                if (player.isCombatFlagEquipped())
+                else if (player.isCombatFlagEquipped())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_HOLDING_A_FLAG);
                         return null;
                 }
-                if (player.getPet() != null || player.isMounted())
+                else if (player.getPet() != null || player.isMounted())
                 {
                         player.sendPacket(SystemMessageId.YOU_CANNOT_BOARD_AN_AIRSHIP_WHILE_A_PET_OR_A_SERVITOR_IS_SUMMONED);
                         return null;
                 }
-                
-                if (_ship.isInDock() && _ship.isInsideRadius(player, 600, true, false))
+                else if (_ship.isInDock() && _ship.isInsideRadius(player, 600, true, false))
                         _ship.addPassenger(player);
                 
@@ -191 +188 @@
         }
         
+        @Override
         public void run()
         {
@@ -203 +201 @@
                                         break;
                                 case 1:
-                                        //_ship.teleToLocation(-167874, 256731, -509, 41035, false);
+                                        // _ship.teleToLocation(-167874, 256731, -509, 41035, false);
                                         _ship.setOustLoc(OUST_GRACIA);
                                         ThreadPoolManager.getInstance().scheduleGeneral(this, 5000);
@@ -222 +220 @@
                                         break;
                                 case 5:
-                                        //                                      _ship.teleToLocation(-157261, 255664, 221, 64781, false);
+                                        // _ship.teleToLocation(-157261, 255664, 221, 64781, false);
                                         _ship.setOustLoc(OUST_GLUDIO);
                                         ThreadPoolManager.getInstance().scheduleGeneral(this, 5000);
@@ -277 +275 @@
                                 for (int id : CONTROLLERS)
                                 {
-                                        if (((L2Npc)obj).getNpcId() == id)
-                                                return (L2Npc)obj;
+                                        if (((L2Npc) obj).getNpcId() == id)
+                                                return (L2Npc) obj;
                                 }
                         }