projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-03 04:16:19 -04:00
Code Issues Projects Releases Wiki Activity

Fixed loads of warnings

Browse Source
This commit is contained in:
Treeku
2014-05-14 15:51:25 +01:00
parent 3f571c48aa
commit 865db149ad
36 changed files with 46 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/resources/ResourceService.java
+5 -13
View File
@@ -22,7 +22,6 @@
package services.resources;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Map;
import java.util.Random;
import java.util.Vector;
@@ -30,10 +29,7 @@ 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.database.ODBCursor;
import engine.resources.objects.SWGObject;
import engine.resources.scene.Planet;
@@ -41,8 +37,6 @@ import engine.resources.scene.Point3D;
import engine.resources.scene.Quaternion;
import engine.resources.service.INetworkDispatch;
import engine.resources.service.INetworkRemoteEvent;
import resources.common.OutOfBand;
import resources.common.ProsePackage;
import resources.datatables.MilkState;
import resources.objects.creature.CreatureObject;
import resources.objects.harvester.HarvesterObject;
@@ -11444,11 +11438,9 @@ public class ResourceService implements INetworkDispatch {
containerObject.setProprietor(crafter);
containerObject.setStackCount(stackCount,false);
//int stackCount = core.resourceService.getResourceSampleQuantity(crafter, sampleResource);
containerObject.initializeStats(sampleResource);
int resCRC = CRC.StringtoCRC(resourceContainerIFF);
containerObject.setIffFileName(resourceContainerIFF);
long objectId = containerObject.getObjectID();
SWGObject crafterInventory = crafter.getSlottedObject("inventory");
containerObject.initializeStats(sampleResource);
containerObject.setIffFileName(resourceContainerIFF);
SWGObject crafterInventory = crafter.getSlottedObject("inventory");
crafterInventory.add(containerObject);
return containerObject;
}
@@ -11476,7 +11468,7 @@ public class ResourceService implements INetworkDispatch {
public boolean canMilk(CreatureObject actor, CreatureObject target) {
if(target.getPosture() == 14 || !actor.inRange(target.getWorldPosition(), 5) || actor.getCombatFlag() == 1 || target.getCombatFlag() == 1)
if(target.getPosture() == 14 || !actor.inRange(target.getWorldPosition(), 5) || actor.isInCombat() || target.isInCombat())
return false;
AIActor ai = (AIActor) target.getAttachment("AI");
@@ -11593,7 +11585,7 @@ public class ResourceService implements INetworkDispatch {
return;
}
if(actor.getCombatFlag() == 1) {
if(actor.isInCombat()) {
actor.sendSystemMessage("@skl_use:milk_combat", (byte) 0);
ai.setMilkState(MilkState.NOTYETMILKED);
return;