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

trunk/L2J_DataPack/dist/game/data/scripts/conquerablehalls/RainbowSpringsChateau/RainbowSpringsChateau.java

@@ -15 +15 @@
 package conquerablehalls.RainbowSpringsChateau;
 
-import gnu.trove.TIntLongHashMap;
+import gnu.trove.map.hash.TIntLongHashMap;
 
 import java.sql.Connection;
@@ -40 +40 @@
 import com.l2jserver.gameserver.instancemanager.ZoneManager;
 import com.l2jserver.gameserver.model.L2Clan;
-import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
@@ -49 +48 @@
 import com.l2jserver.gameserver.model.entity.clanhall.SiegableHall;
 import com.l2jserver.gameserver.model.entity.clanhall.SiegeStatus;
+import com.l2jserver.gameserver.model.item.L2Item;
+import com.l2jserver.gameserver.model.item.instance.L2ItemInstance;
 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;
 import com.l2jserver.gameserver.network.clientpackets.Say2;
 import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
 import com.l2jserver.gameserver.network.serverpackets.NpcSay;
-import com.l2jserver.gameserver.templates.item.L2Item;
+import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 import com.l2jserver.util.Rnd;
 
 /**
  * @author BiggBoss
- * Rainbow Springs Cheateau clan hall siege script
+ * Rainbow Springs Chateau clan hall siege script
  */
 public class RainbowSpringsChateau extends Quest
@@ -176 +176 @@
                         for(int arenaId : ARENA_ZONES)
                         {
-                                L2ZoneType zone = ZoneManager.getInstance().getZoneById(arenaId);
-                                for(L2Character cha : (L2Character[])zone.getCharactersInside().getValues())
-                                        cha.teleToLocation(TeleportWhereType.Town);
+                                final L2TIntObjectHashMap<L2Character> chars = ZoneManager.getInstance().getZoneById(arenaId).getCharactersInside();
+                                for(L2Character chr : chars.values(new L2Character[0]))
+                                {
+                                        chr.teleToLocation(TeleportWhereType.Town);
+                                }
                         }
                 }
@@ -639 +641 @@
                                 continue;
                         
-                        for(L2Character plr : (L2Character[])ZoneManager.getInstance().getZoneById(id).getCharactersInside().getValues())
+                        final L2TIntObjectHashMap<L2Character> chars = ZoneManager.getInstance().getZoneById(id).getCharactersInside();
+                        for(L2Character chr : chars.values(new L2Character[0]))
                         {
                                 for(L2Skill sk : DEBUFFS)
-                                        sk.getEffects(plr, plr);
+                                        sk.getEffects(chr, chr);
                         }
                 }