summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-05 13:23:22 +0000
committerSteve <steveb9@u.washington.edu>2011-03-05 13:23:22 +0000
commit1d3e0f9df9174f3485f1c27f8720178b38e1582e (patch)
tree836310089071f989a0943105e99a4fcbe1019df1
parent78ddd0494aa7b9adba29630ffd28454da9e92d3a (diff)
buggy
-rw-r--r--src/tesseract/World.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index 4f88092..304ff3a 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -263,7 +263,7 @@ public class World implements Observer {
CollisionDetector.calculateCollisions(myObjects.get(i),myObjects.get(j));
//if 'i' side and a neighbor exists, transmit j object to that node
- if (collisions.size() > 0) {
+ if (collisions.size() > 0 && myObjects.get(i) instanceof HalfSpace || myObjects.get(j) instanceof HalfSpace ) {
if (myObjects.get(i).equals(my_side1) && myPeer.getPeerInDirection
(my_side1.getPosition().getX(), my_side1.getPosition().getY()) != null) {
@@ -323,6 +323,7 @@ public class World implements Observer {
myObjects.get(i).detach();
myObjects.remove(i);
}
+
myObjects.get(i).resolveCollisions(myObjects.get(j));
}
}