summaryrefslogtreecommitdiff
path: root/src/common
diff options
context:
space:
mode:
authorJesse Morgan <jesse@jesterpm.net>2011-03-18 05:28:14 +0000
committerJesse Morgan <jesse@jesterpm.net>2011-03-18 05:28:14 +0000
commit8c88c2ea28f2a20edc74d301a3f36264637ce40b (patch)
treeee65fb96c09db17d83f4fa511ee7fc25007e6ddf /src/common
parent02f9894a0ff7950076da6e227356c8f79fb10c98 (diff)
Don't send objects that can't be sent...
Diffstat (limited to 'src/common')
-rw-r--r--src/common/CollisionDetector.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/CollisionDetector.java b/src/common/CollisionDetector.java
index dbe2b15..f193a29 100644
--- a/src/common/CollisionDetector.java
+++ b/src/common/CollisionDetector.java
@@ -272,8 +272,8 @@ public class CollisionDetector {
if (a instanceof Sphere && b instanceof Sphere)
return calculateCollisions((Sphere)a, (Sphere)b);
- /*if (!a.getBounds().intersect(b.getBounds()))
- return EMPTY_COLLISION_LIST;*/
+ if (!a.getBounds().intersect(b.getBounds()))
+ return EMPTY_COLLISION_LIST;
if (a instanceof Particle)
return calculateCollisions((Particle)a, b);