projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-07 22:13:08 -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/resources/objects/creature/CreatureObject.java
-1
View File
@@ -104,7 +104,6 @@ public class CreatureObject extends TangibleObject implements Serializable {
private transient int missionCriticalObjectsUpdateCounter = 0;
// CREO6
private byte combatFlag = 0;
private short level = -1;
private int grantedHealth = 0;
private String currentAnimation;
src/resources/objects/group/GroupObject.java
+1
View File
@@ -32,6 +32,7 @@ import engine.resources.scene.Quaternion;
public class GroupObject extends UniverseObject {
private static final long serialVersionUID = 1L;
private Vector<SWGObject> memberList = new Vector<SWGObject>();
private int memberListUpdateCounter;
private SWGObject groupLeader;
src/resources/objects/harvester/HarvesterMessageBuilder.java
+8 -8
View File
@@ -168,9 +168,9 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder {
Vector<ResourceContainerObject> outputHopperContent = harvester.getOutputHopperContent();
int hopperContentSize = outputHopperContent.size();
int iHopperList = 1;
//int iHopperList = 1;
if (hopperContentSize==0) {
iHopperList = 0;
//iHopperList = 0;
}
//int sizeP = 30 + 15*hopperContentSize;
int sizeP = 30-2-4-4;
@@ -195,12 +195,12 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder {
// buffer.putInt(iHopperList);
// buffer.putInt(harvester.getResourceUpdateCount());
int sumOfHopper = 0;
int i = 0;
//int i = 0;
sumOfHopper = 0;
Vector<ResourceContainerObject> outputHopper = harvester.getOutputHopperContent();
for (ResourceContainerObject cont : outputHopper){
sumOfHopper += cont.getStackCount();
i++;
//i++;
}
buffer.putShort((short)0x0A);
@@ -432,9 +432,9 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder {
public IoBuffer buildHINO7ActivateDelta2(HarvesterObject harvester) {
int iHopperList = 0;
//int iHopperList = 0;
if (harvester.getOutputHopperContent().size() >= 1) {
iHopperList = 1;
//iHopperList = 1;
}
IoBuffer buffer = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN);
@@ -463,9 +463,9 @@ public class HarvesterMessageBuilder extends TangibleMessageBuilder {
public IoBuffer buildHINO7ActivateDelta2old(HarvesterObject harvester) {
int iHopperList = 0;
//int iHopperList = 0;
if (harvester.getOutputHopperContent().size() >= 1) {
iHopperList = 1;
//iHopperList = 1;
}
IoBuffer buffer = IoBuffer.allocate(10).order(ByteOrder.LITTLE_ENDIAN);
src/resources/objects/installation/InstallationMessageBuilder.java
+2 -3
View File
@@ -27,7 +27,6 @@ import java.util.Map;
import org.apache.mina.core.buffer.IoBuffer;
import engine.resources.objects.Builder;
import resources.objects.harvester.HarvesterObject;
import resources.objects.tangible.TangibleMessageBuilder;
public class InstallationMessageBuilder extends TangibleMessageBuilder{
@@ -174,8 +173,8 @@ public class InstallationMessageBuilder extends TangibleMessageBuilder{
public IoBuffer constructINSO7Var1(InstallationObject installationObject,long selectedResource) {
IoBuffer buffer = bufferPool.allocate(10, false).order(ByteOrder.LITTLE_ENDIAN);
int hopperContentsSize = ((HarvesterObject)installationObject).getOutputHopperContent().size()+1;
byte updateCounter = ((HarvesterObject)installationObject).getUpdateCount();
//int hopperContentsSize = ((HarvesterObject)installationObject).getOutputHopperContent().size()+1;
//byte updateCounter = ((HarvesterObject)installationObject).getUpdateCount();
buffer.setAutoExpand(true);
buffer.putShort((short)2); // buffer.putShort((short)updateCounter);
src/resources/objects/resource/GalacticResource.java
+1 -1
View File
@@ -231,7 +231,7 @@ public class GalacticResource extends SWGObject implements Serializable {
public void generateResourceStats(){
// Generate the stats randomly, considering the caps
for (int k=0;k<resourceRoot.getResourceMinCaps().length; k++) {
short result = 0;
//short result = 0;
short randomStatValue = 0;
if ((resourceRoot.getResourceMaxCaps()[k]-resourceRoot.getResourceMinCaps()[k])>0)
randomStatValue = (short) (resourceRoot.getResourceMinCaps()[k] + new Random().nextInt(resourceRoot.getResourceMaxCaps()[k]-resourceRoot.getResourceMinCaps()[k]));