Răsfoiți Sursa

BETA: Using propper way getting values in an array at L2TIntObjectHashMap since the update done on trove. This way we will prevent unexpected AIOOBEs

Nik 13 ani în urmă
părinte
comite
2333758066

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

@@ -104,7 +104,7 @@ public class MailManager
 	
 	public final Message[] getMessages()
 	{
-		return _messages.values(new Message[_messages.size()]);
+		return _messages.values();
 	}
 	
 	public final boolean hasUnreadPost(L2PcInstance player)

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Manor.java

@@ -53,7 +53,7 @@ public class L2Manor
 	
 	public SeedData[] getSeedsDataArray()
 	{
-		return _seeds.values(new SeedData[_seeds.size()]);
+		return _seeds.values();
 	}
 	
 	public FastList<Integer> getAllCrops()

+ 2 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2World.java

@@ -214,7 +214,7 @@ public final class L2World
 	
 	public final L2Object[] getAllVisibleObjectsArray()
 	{
-		return _allObjects.values(new L2Object[_allObjects.size()]);
+		return _allObjects.values();
 	}
 	
 	public final boolean forEachObject(final TObjectProcedure<L2Object> proc)
@@ -247,7 +247,7 @@ public final class L2World
 	
 	public final L2PcInstance[] getAllPlayersArray()
 	{
-		return _allPlayers.values(new L2PcInstance[_allPlayers.size()]);
+		return _allPlayers.values();
 	}
 	
 	public final boolean forEachPlayer(final TObjectProcedure<L2PcInstance> proc)

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

@@ -6092,7 +6092,7 @@ public abstract class L2Character extends L2Object
 		if (_skills == null)
 			return new L2Skill[0];
 		
-		return _skills.values(new L2Skill[_skills.size()]);
+		return _skills.values();
 	}
 	
 	public ChanceSkillList getChanceSkills()

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

@@ -5568,7 +5568,7 @@ public final class L2PcInstance extends L2Playable
 		// Unsummon Cubics
 		if (!_cubics.isEmpty())
 		{
-			for (L2CubicInstance cubic : _cubics.values(new L2CubicInstance[_cubics.size()]))
+			for (L2CubicInstance cubic : _cubics.values())
 			{
 				cubic.stopAction();
 				cubic.cancelDisappear();
@@ -9616,7 +9616,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())
 			{
 				if (cubic.givenByOther())
 				{
@@ -10104,7 +10104,7 @@ public final class L2PcInstance extends L2Playable
 		
 		if (!getCubics().isEmpty())
 		{
-			for (L2CubicInstance cubic : _cubics.values(new L2CubicInstance[_cubics.size()]))
+			for (L2CubicInstance cubic : _cubics.values())
 			{
 				cubic.stopAction();
 				cubic.cancelDisappear();
@@ -13177,7 +13177,7 @@ public final class L2PcInstance extends L2Playable
 	
 	public TimeStamp[] getReuseTimeStamps()
 	{
-		return _reuseTimeStamps.values(new TimeStamp[_reuseTimeStamps.size()]);
+		return _reuseTimeStamps.values();
 	}
 	
 	public L2TIntObjectHashMap<TimeStamp> getReuseTimeStamp()

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java

@@ -467,7 +467,7 @@ public abstract class L2ZoneType
 	
 	public L2Character[] getCharactersInsideArray()
 	{
-		return _characterList.values(new L2Character[_characterList.size()]);
+		return _characterList.values();
 	}
 	
 	public void addQuestEvent(Quest.QuestEventType EventType, Quest q)

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSummon.java

@@ -168,7 +168,7 @@ public class L2SkillSummon extends L2Skill
 					if (mastery == 0 && !player.getCubics().isEmpty())
 					{
 						// Player can have only 1 cubic - we should replace old cubic with new one
-						for (L2CubicInstance c: player.getCubics().values(new L2CubicInstance[player.getCubics().size()]))
+						for (L2CubicInstance c: player.getCubics().values())
 						{
 							c.stopAction();
 							c = null;

+ 1 - 1
L2J_Server_BETA/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java

@@ -64,7 +64,7 @@ public class AttackStanceTaskManager
 		if (actor instanceof L2PcInstance)
 		{
 			L2PcInstance player = (L2PcInstance) actor;
-			for (L2CubicInstance cubic : player.getCubics().values(new L2CubicInstance[player.getCubics().size()]))
+			for (L2CubicInstance cubic : player.getCubics().values())
 				if (cubic.getId() != L2CubicInstance.LIFE_CUBIC)
 					cubic.doAction();
 		}