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

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

Browse Source 
Conflicts:
	src/resources/objects/building/BuildingObject.java
This commit is contained in:
Light2
2013-12-15 01:35:02 +01:00
parent 1e68c71177 7525dbcd71
commit 1f4458997b
21 changed files with 494 additions and 399 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resources/objects/building/BuildingObject.java
+4 -4
View File
@@ -24,9 +24,9 @@ package resources.objects.building;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import resources.objects.cell.CellObject;
import com.sleepycat.je.Environment;
import com.sleepycat.je.Transaction;
import resources.objects.tangible.TangibleObject;
import com.sleepycat.persist.model.Entity;
import com.sleepycat.persist.model.NotPersistent;
import engine.clients.Client;
@@ -37,8 +37,8 @@ import engine.resources.scene.Planet;
import engine.resources.scene.Point3D;
import engine.resources.scene.Quaternion;
@Entity
public class BuildingObject extends SWGObject implements IPersistent {
@Entity(version=0)
public class BuildingObject extends TangibleObject implements IPersistent {
@NotPersistent
private BuildingMessageBuilder messageBuilder;
@@ -51,7 +51,7 @@ public class BuildingObject extends SWGObject implements IPersistent {
}
public BuildingObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
super(objectID, planet, position, orientation, Template);
super(objectID, planet, Template, position, orientation);
messageBuilder = new BuildingMessageBuilder(this);
}