projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-28 13:12:54 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	.gitignore
	src/main/NGECore.java
	src/resources/objects/creature/CreatureObject.java
	src/resources/objects/mission/MissionObject.java
	src/resources/objects/tangible/TangibleObject.java
	src/services/chat/Mail.java
	src/services/mission/MissionObjective.java
	src/services/object/ObjectService.java
	src/services/playercities/PlayerCity.java
This commit is contained in:
Light2
2014-05-01 21:08:20 +02:00
parent 62593b08de 12ca3ae661
commit 536b51d953
379 changed files with 5722 additions and 1273 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/building/BuildingObject.java
+18 -6
View File
@@ -63,15 +63,15 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria
private short maximumStorageCapacity=0;
private Vector<Long> entryList = new Vector<Long>(); // Preferably the OIDs should be stored, because of name changes
private Vector<Long> banList = new Vector<Long>();
public BuildingObject() {
super();
public BuildingObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
super(objectID, planet, Template, position, orientation);
messageBuilder = new BuildingMessageBuilder(this);
this.setConditionDamage(100);
}
public BuildingObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
super(objectID, planet, Template, position, orientation);
public BuildingObject() {
super();
messageBuilder = new BuildingMessageBuilder(this);
this.setConditionDamage(100);
}
@@ -91,6 +91,18 @@ public class BuildingObject extends TangibleObject implements IPersistent, Seria
}
public int getCellNumberByObjectId(long objectId) {
Vector<CellObject> cells = getCells();
for (CellObject cell : cells) {
if (cell.getObjectID() == objectId) {
return cell.getCellNumber();
}
}
return 0;
}
public float getMaintenanceAmount() {
return maintenanceAmount;
}