From 8611e3f55d4b8d6b4091deda5aa476fda9025f20 Mon Sep 17 00:00:00 2001
From: Steve <steveb9@u.washington.edu>
Date: Mon, 7 Mar 2011 01:57:17 +0000
Subject: added all if statements back for testing

---
 src/tesseract/World.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/tesseract/World.java b/src/tesseract/World.java
index 57664c5..b4b1013 100644
--- a/src/tesseract/World.java
+++ b/src/tesseract/World.java
@@ -351,7 +351,7 @@ public class World implements Observer {
 						}
 
 						//if 'i' side and a neighbor exists, transmit j object to that node
-						if (i_object.equals(my_side1) || i_object.equals(my_side3)) {
+						if (i_object.equals(my_side1)) {
 							int test = myPeer.getPeerSize();
 							if(test > 0) {
 								System.out.println("Hit Side 1 J" + i_object.getPosition());
@@ -368,7 +368,7 @@ public class World implements Observer {
 							i_object.resolveCollisions(j_object, collisions);
 						}
 
-						if (i_object.equals(my_side2) || i_object.equals(my_side4)) { 
+						if (i_object.equals(my_side2)) { 
 							int test = myPeer.getPeerSize();
 							if(test > 0) {
 							
@@ -386,7 +386,7 @@ public class World implements Observer {
 							i_object.resolveCollisions(j_object, collisions);
 						}
 						
-						/*if (i_object.equals(my_side3)) { 
+						if (i_object.equals(my_side3)) { 
 							int test = myPeer.getPeerSize();
 							if(test > 0) {
 							
@@ -419,10 +419,10 @@ public class World implements Observer {
 								}
 							}
 							i_object.resolveCollisions(j_object, collisions);
-						}*/
+						}
 						
 						//if 'j' side and a neighbor exists, transmit i object to that node
-						if (j_object.equals(my_side1) || j_object.equals(my_side3)) {
+						if (j_object.equals(my_side1)) {
 							int test = myPeer.getPeerSize();
 							if(test > 0) {
 							
@@ -439,7 +439,7 @@ public class World implements Observer {
 							}
 							j_object.resolveCollisions(i_object, collisions);
 						} 
-						if (j_object.equals(my_side2) || j_object.equals(my_side4)) {
+						if (j_object.equals(my_side2)) {
 							int test = myPeer.getPeerSize();
 							if(test > 0) {
 							
@@ -456,7 +456,7 @@ public class World implements Observer {
 							}
 							j_object.resolveCollisions(i_object, collisions);
 						}
-						/*if (j_object.equals(my_side3)) {
+						if (j_object.equals(my_side3)) {
 							int test = myPeer.getPeerSize();
 							if(test > 0) {
 							
@@ -489,7 +489,7 @@ public class World implements Observer {
 								}
 							}
 							j_object.resolveCollisions(i_object, collisions);
-						}*/
+						}
 					} else {
 						i_object.resolveCollisions(j_object, collisions);
 					}
-- 
cgit v1.2.3