From 83d1cc911a23f0d9f0addf705cf5de3cf8864c2b Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Mon, 26 Jan 2015 19:38:24 -0800
Subject: [PATCH] hacking

---
 libraries/entities/src/EntityItem.cpp       | 6 ++++--
 libraries/physics/src/EntityMotionState.cpp | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/libraries/entities/src/EntityItem.cpp b/libraries/entities/src/EntityItem.cpp
index 673f23e328..338009c280 100644
--- a/libraries/entities/src/EntityItem.cpp
+++ b/libraries/entities/src/EntityItem.cpp
@@ -562,8 +562,10 @@ int EntityItem::readEntityDataFromBuffer(const unsigned char* data, int bytesLef
             // was at that last known positition.
             
             float skipTimeForward = (float)(now - _lastSimulated) / (float)(USECS_PER_SECOND);
-            qDebug() << "skipTimeForward:" << skipTimeForward;
-            simulateKinematicMotion(skipTimeForward);
+            if (skipTimeForward > 0.0f) {
+                qDebug() << "skipTimeForward:" << skipTimeForward;
+                simulateKinematicMotion(skipTimeForward);
+            }
             //simulate(now);
             _lastSimulated = now;
         }
diff --git a/libraries/physics/src/EntityMotionState.cpp b/libraries/physics/src/EntityMotionState.cpp
index 01063a43d6..3355f12b47 100644
--- a/libraries/physics/src/EntityMotionState.cpp
+++ b/libraries/physics/src/EntityMotionState.cpp
@@ -97,6 +97,8 @@ void EntityMotionState::setWorldTransform(const btTransform& worldTrans) {
     // DANGER! EntityItem stores angularVelocity in degrees/sec!!!
     _entity->setAngularVelocity(glm::degrees(v));
 
+    _entity->setLastSimulated(usecTimestampNow());
+
     _outgoingPacketFlags = DIRTY_PHYSICS_FLAGS;
     EntityMotionState::enqueueOutgoingEntity(_entity);