diff --git a/src/main/java/cactusServer/entities/MovableObject.java b/src/main/java/cactusServer/entities/MovableObject.java index 565992e..335c124 100644 --- a/src/main/java/cactusServer/entities/MovableObject.java +++ b/src/main/java/cactusServer/entities/MovableObject.java @@ -15,7 +15,6 @@ import net.arnx.jsonic.JSONHint; public class MovableObject extends Entity3D { - private Position3D position; private Velocity3D velocity; private AngularVelocity3D angularVelocity; private Quaternion3D angle; @@ -44,7 +43,7 @@ } public Position3D getPosition() { - return position; + return ((Object3D) (getPlaceable().getBody())).getPosition3D(); } @JSONHint(ignore = true) @@ -72,7 +71,6 @@ } public void setPosition(Position3D position) { - this.position = position; if (placeable != null) ((Object3D) (getPlaceable().getBody())).setPosition(position); } diff --git a/src/main/java/cactusServer/utils/App.java b/src/main/java/cactusServer/utils/App.java index 00dfd47..5d390e2 100644 --- a/src/main/java/cactusServer/utils/App.java +++ b/src/main/java/cactusServer/utils/App.java @@ -36,7 +36,7 @@ @ApplicationPath("/rest") public class App extends ResourceConfig implements Runnable { private ScheduledThreadPoolExecutor task = new ScheduledThreadPoolExecutor(1000); - private long lasttime = System.nanoTime(); + private long lasttime = System.currentTimeMillis(); private boolean debugflag = false; public App() { @@ -55,11 +55,10 @@ @Override public void run() { - // System.out.println("�^�X�N�����s"); - CollisionManager.getInstance().collisionRun(System.nanoTime() - lasttime); + CollisionManager.getInstance().collisionRun(System.currentTimeMillis() - lasttime); removeDeadBullets(); removeInactivePlayers(); - lasttime = System.nanoTime(); + lasttime = System.currentTimeMillis(); } public void start(int interval) {