summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-05 12:53:20 +0000
committerSteve <steveb9@u.washington.edu>2011-03-05 12:53:20 +0000
commitb084961c799c59a980324c6161b494138c9b52eb (patch)
tree494178e0d92d9b1361cfb65c891b13db38be452e /src
parentd991728a32705a66f101a489956e3bdf1deb61eb (diff)
small changes 2 computers many commits
Diffstat (limited to 'src')
-rw-r--r--src/tesseract/World.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index 8323aef..78583e7 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 && myObjects.get(i) instanceof HalfSpace) {
+ if (collisions.size() > 0) {
if (myObjects.get(i).equals(my_side1) && myPeer.getPeerInDirection
(my_side1.getPosition().getX(), my_side1.getPosition().getY()) != null) {
@@ -288,7 +288,7 @@ public class World implements Observer {
}
//if 'j' is a side transmit i object
- } else if (collisions.size() > 0 && myObjects.get(j) instanceof HalfSpace) {
+ } else if (collisions.size() > 0) {
if (myObjects.get(j).equals(my_side1)&& myPeer.getPeerInDirection
(my_side1.getPosition().getX(), my_side1.getPosition().getY()) != null) {