From 9cc1fe35dba2176e8a3a5cebb88a6dee4e1f127e Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Wed, 24 Sep 2014 18:22:28 -0700
Subject: [PATCH] only do collisions on entities moving toward each other

---
 libraries/entities/src/EntityCollisionSystem.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityCollisionSystem.cpp b/libraries/entities/src/EntityCollisionSystem.cpp
index 8d5941e3e0..c9040c7a6e 100644
--- a/libraries/entities/src/EntityCollisionSystem.cpp
+++ b/libraries/entities/src/EntityCollisionSystem.cpp
@@ -116,7 +116,7 @@ void EntityCollisionSystem::updateCollisionWithEntities(EntityItem* entityA) {
         glm::vec3 relativeVelocity = entityA->getVelocity() - entityB->getVelocity();
 
         bool movingTowardEachOther = glm::dot(relativeVelocity, penetrationInTreeUnits) > 0.0f;
-        bool doCollisions = true;
+        bool doCollisions = movingTowardEachOther; // don't do collisions if the entities are moving away from each other
 
         if (doCollisions) {
             quint64 now = usecTimestampNow();