projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-07-14 00:02:07 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Browse Source 
Conflicts:
	src/main/NGECore.java
This commit is contained in:
Light2
2014-04-11 23:53:15 +02:00
parent ea8bc53394 3ebf1dbf94
commit e5ed3a356c
268 changed files with 6673 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/resources/ResourceService.java
+33 -1
View File
@@ -28,14 +28,16 @@ import java.util.Random;
import java.util.Vector;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import com.sleepycat.persist.EntityCursor;
import main.NGECore;
import engine.resources.common.CRC;
import engine.resources.objects.SWGObject;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
import resources.objects.creature.CreatureObject;
import resources.objects.harvester.HarvesterObject;
import resources.objects.resource.GalacticResource;
import resources.objects.resource.ResourceContainerObject;
import resources.objects.resource.ResourceRoot;
@@ -11307,6 +11309,36 @@ public class ResourceService implements INetworkDispatch {
return resource;
}
public Vector<GalacticResource> getSpawnedResourcesByPlanetAndHarvesterType(int planetId, byte harvesterType) {
Vector<GalacticResource> planetResourceList = new Vector<GalacticResource>();
byte searchtype = harvesterType;
if (harvesterType==7) searchtype = (byte) 0;
for (GalacticResource gal : allSpawnedResources){
if (gal.isSpawnedOn(planetId) && gal.getGeneralType()==searchtype)
if (harvesterType!=HarvesterObject.HARVESTER_TYPE_FUSION)
planetResourceList.add(gal);
else if (harvesterType==HarvesterObject.HARVESTER_TYPE_FUSION) {
System.err.println("gal.getContainerType() " + gal.getContainerType());
if (gal.getResourceRoot().getContainerType()==ResourceRoot.CONTAINER_TYPE_ENERGY_RADIOACTIVE)
planetResourceList.add(gal);
} else if (harvesterType==HarvesterObject.HARVESTER_TYPE_GEO) {
System.err.println("gal.getContainerType() " + gal.getContainerType());
if (gal.getGeneralType()==GalacticResource.GENERAL_GEOTHERM)
planetResourceList.add(gal);
}
}
return planetResourceList;
}
public GalacticResource findResourceById(long id){
GalacticResource resource = new GalacticResource();
for (GalacticResource sampleResource : allSpawnedResources){
if (sampleResource.getId()==id)
return sampleResource;
}
return resource;
}
// ToDo: Improve
public GalacticResource grabMeatForCreature(CreatureObject corpse){
GalacticResource resource = null;