Sfoglia il codice sorgente

BETA: Well, why not make the others aswell (more for [4998]

Nik 13 anni fa
parent
commit
f148faacec

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

@@ -268,7 +268,7 @@ public class DoorTable
 	
 	public L2DoorInstance[] getDoors()
 	{
-		L2DoorInstance[] _allTemplates = _staticItems.values(new L2DoorInstance[_staticItems.size()]);
+		L2DoorInstance[] _allTemplates = _staticItems.values();
 		return _allTemplates;
 	}
 	

+ 6 - 6
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -189,7 +189,7 @@ public class NpcTable
 			{
 				if (!skills.isEmpty())
 				{
-					for (L2Skill skill : skills.values(new L2Skill[skills.size()]))
+					for (L2Skill skill : skills.values())
 						created.addSkill(skill);
 				}
 				if (classIds != null)
@@ -304,7 +304,7 @@ public class NpcTable
 	
 	public L2NpcTemplate getTemplateByName(String name)
 	{
-		for (L2NpcTemplate npcTemplate : _npcs.values(new L2NpcTemplate[_npcs.size()]))
+		for (L2NpcTemplate npcTemplate : _npcs.values())
 			if (npcTemplate.name.equalsIgnoreCase(name))
 				return npcTemplate;
 		
@@ -315,7 +315,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[_npcs.size()]))
+		for (L2NpcTemplate t : _npcs.values())
 			if (t.level == lvl)
 				list.add(t);
 		
@@ -326,7 +326,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[_npcs.size()]))
+		for (L2NpcTemplate t : _npcs.values())
 			if (t.level == lvl && "L2Monster".equals(t.type))
 				list.add(t);
 		
@@ -337,7 +337,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[_npcs.size()]))
+		for (L2NpcTemplate t : _npcs.values())
 			if (t.name.startsWith(letter) && "L2Npc".equals((t).type))
 				list.add(t);
 		
@@ -352,7 +352,7 @@ public class NpcTable
 	{
 		List<L2NpcTemplate> list = new FastList<L2NpcTemplate>();
 		
-		for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[_npcs.size()]))
+		for (L2NpcTemplate t : _npcs.values())
 			if (classType.equals(t.type))
 				list.add(t);
 		

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTable.java

@@ -58,7 +58,7 @@ public class SkillTable
 		SkillsEngine.getInstance().loadAllSkills(_skills);
 		
 		_skillMaxLevel.clear();
-		for (final L2Skill skill : _skills.values(new L2Skill[_skills.size()]))
+		for (final L2Skill skill : _skills.values())
 		{
 			final int skillId = skill.getId();
 			final int skillLvl = skill.getLevel();

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java

@@ -127,7 +127,7 @@ public final class ItemAuctionManager
 	
 	public final void shutdown()
 	{
-		final ItemAuctionInstance[] instances = _managerInstances.values(new ItemAuctionInstance[_managerInstances.size()]);
+		final ItemAuctionInstance[] instances = _managerInstances.values();
 		for (final ItemAuctionInstance instance : instances)
 		{
 			instance.shutdown();

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -9600,7 +9600,7 @@ public final class L2PcInstance extends L2Playable
 		if (getCubics() != null)
 		{
 			boolean removed = false;
-			for (L2CubicInstance cubic : _cubics.values(new L2CubicInstance[_cubics.size()]))
+			for (L2CubicInstance cubic : _cubics.values())
 			{
 				cubic.stopAction();
 				delCubic(cubic.getId());

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/ItemAuctionInstance.java

@@ -212,7 +212,7 @@ public final class ItemAuctionInstance
 	
 	final void checkAndSetCurrentAndNextAuction()
 	{
-		final ItemAuction[] auctions = _auctions.values(new ItemAuction[_auctions.size()]);
+		final ItemAuction[] auctions = _auctions.values();
 		
 		ItemAuction currentAuction = null;
 		ItemAuction nextAuction = null;
@@ -354,7 +354,7 @@ public final class ItemAuctionInstance
 		
 		synchronized (_auctions)
 		{
-			auctions = _auctions.values(new ItemAuction[_auctions.size()]);
+			auctions = _auctions.values();
 		}
 		
 		return auctions;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/templates/chars/L2NpcTemplate.java

@@ -465,7 +465,7 @@ public final class L2NpcTemplate extends L2CharTemplate
 	
 	public L2Skill[] getSkillsArray()
 	{
-		return _skills.values(new L2Skill[_skills.size()]);
+		return _skills.values();
 	}
 	
 	public void addQuestEvent(Quest.QuestEventType EventType, Quest q)