BETA: ManorData cleanup

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ManorData.java

@@ -15,7 +15,7 @@
 package com.l2jserver.gameserver.datatables;
 
 import java.util.ArrayList;
-import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Level;
@@ -28,7 +28,6 @@ import com.l2jserver.gameserver.engines.DocumentParser;
 import com.l2jserver.gameserver.model.L2Seed;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.items.L2Item;
-import com.l2jserver.util.L2FastMap;
 
 /**
  * Service class for manor
@@ -38,11 +37,10 @@ public class ManorData extends DocumentParser
 {
 	private static Logger _log = Logger.getLogger(ManorData.class.getName());
 	
-	private static Map<Integer, L2Seed> _seeds;
+	private static Map<Integer, L2Seed> _seeds = new HashMap<>();
 	
 	protected ManorData()
 	{
-		_seeds = new L2FastMap<>(true);
 		load();
 	}
 	
@@ -94,16 +92,11 @@ public class ManorData extends DocumentParser
 		}
 	}
 	
-	public Collection<L2Seed> getSeedsData()
-	{
-		return _seeds.values();
-	}
-	
 	public List<Integer> getAllCrops()
 	{
 		List<Integer> crops = new ArrayList<>();
 		
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if (!crops.contains(seed.getCropId()) && (seed.getCropId() != 0) && !crops.contains(seed.getCropId()))
 			{
@@ -126,7 +119,7 @@ public class ManorData extends DocumentParser
 	
 	public int getSeedBasicPriceByCrop(int cropId)
 	{
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if (seed.getCropId() == cropId)
 			{
@@ -148,7 +141,7 @@ public class ManorData extends DocumentParser
 	
 	public int getMatureCrop(int cropId)
 	{
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if (seed.getCropId() == cropId)
 			{
@@ -193,7 +186,7 @@ public class ManorData extends DocumentParser
 	
 	public int getSeedLevelByCrop(int cropId)
 	{
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if (seed.getCropId() == cropId)
 			{
@@ -238,7 +231,7 @@ public class ManorData extends DocumentParser
 	
 	public int getRewardItem(int cropId, int type)
 	{
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if (seed.getCropId() == cropId)
 			{
@@ -268,7 +261,7 @@ public class ManorData extends DocumentParser
 	{
 		List<Integer> crops = new ArrayList<>();
 		
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if ((seed.getCastleId() == castleId) && !crops.contains(seed.getCropId()))
 			{
@@ -288,7 +281,7 @@ public class ManorData extends DocumentParser
 	{
 		List<Integer> seedsID = new ArrayList<>();
 		
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if ((seed.getCastleId() == castleId) && !seedsID.contains(seed.getSeedId()))
 			{
@@ -328,7 +321,7 @@ public class ManorData extends DocumentParser
 	
 	public int getCropPuchaseLimit(int cropId)
 	{
-		for (L2Seed seed : getSeedsData())
+		for (L2Seed seed : _seeds.values())
 		{
 			if (seed.getCropId() == cropId)
 			{
@@ -347,9 +340,4 @@ public class ManorData extends DocumentParser
 	{
 		protected static final ManorData _instance = new ManorData();
 	}
-	
-	public static void main(String[] args)
-	{
-		getInstance();
-	}
 }