Changeset 8630 for trunk/L2J_DataPack/dist/game/data/scripts/ai/individual/IceFairySirra.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/ai/individual/IceFairySirra.java (modified) (3 diffs)

trunk/L2J_DataPack/dist/game/data/scripts/ai/individual/IceFairySirra.java

@@ -27 +27 @@
 import com.l2jserver.gameserver.datatables.SpawnTable;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Spawn;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.NpcStringId;
@@ -44 +44 @@
  * @author Kerberos
  */
-
 public class IceFairySirra extends L2AttackableAIScript
 {
@@ -329 +328 @@
                 {
                         if (npc.isBusy())//should never happen
+                        {
                                 return super.onAdvEvent(event, npc, player);
+                        }
+                        
+                        String filename = "";
+                        if (player.isInParty() && player.getParty().getPartyLeaderOID() == player.getObjectId())
+                        {
+                                if (checkItems(player))
+                                {
+                                        startQuestTimer("start",100000,null,player);
+                                        _player = player;
+                                        destroyItems(player);
+                                        player.getInventory().addItem("Scroll",8379,3,player,null);
+                                        npc.setBusy(true);
+                                        screenMessage(player,NpcStringId.STEWARD_PLEASE_WAIT_A_MOMENT,100000);
+                                        filename = getHtmlPath(3);
+                                }
+                                else
+                                {
+                                        filename = getHtmlPath(2);
+                                }
+                        }
                         else
                         {
-                                String filename = "";
-                                if (player.isInParty() && player.getParty().getPartyLeaderOID() == player.getObjectId())
-                                {
-                                        if (checkItems(player) == true)
-                                        {
-                                                startQuestTimer("start",100000,null,player);
-                                                _player = player;
-                                                destroyItems(player);
-                                                player.getInventory().addItem("Scroll",8379,3,player,null);
-                                                npc.setBusy(true);
-                                                screenMessage(player,NpcStringId.STEWARD_PLEASE_WAIT_A_MOMENT,100000);
-                                                filename = getHtmlPath(3);
-                                        }
-                                        else
-                                        {
-                                                filename = getHtmlPath(2);
-                                        }
-                                }
-                                else
-                                {
-                                        filename = getHtmlPath(1);
-                                }
-                                sendHtml(npc, player, filename);
-                        }
+                                filename = getHtmlPath(1);
+                        }
+                        sendHtml(npc, player, filename);
                 }
                 else if (event.equalsIgnoreCase("start"))