summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSteve <steveb9@u.washington.edu>2011-03-05 13:01:52 +0000
committerSteve <steveb9@u.washington.edu>2011-03-05 13:01:52 +0000
commit46aa438c84855445de058cac2640fd9efdcda4f2 (patch)
tree7545ade3e8c5d13f4eda18520d83f34cbe29c5d6 /src
parente6c4054bb5dceedb4e9ee302c996f3efaf34dc75 (diff)
n
Diffstat (limited to 'src')
-rw-r--r--src/tesseract/World.java3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index b2c21e6..9741593 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -291,8 +291,6 @@ public class World implements Observer {
}
//if 'j' is a side transmit i object
- } else if (collisions.size() > 0) {
-
if (myObjects.get(j).equals(my_side1)&& myPeer.getPeerInDirection
(my_side1.getPosition().getX(), my_side1.getPosition().getY()) != null) {
myPeer.sendPayloadToPeer(myPeer.getPeerInDirection
@@ -317,7 +315,6 @@ public class World implements Observer {
(my_side4.getPosition().getX(), my_side4.getPosition().getY()), myObjects.get(i));
myObjects.get(i).detach();
}
- } else if (collisions.size() > 0) {
myObjects.get(i).resolveCollisions(myObjects.get(j));
}
}