michael/Party-Parrots-At-Sea
1
0
Fork 0
mirror of https://github.com/michaelrausch/Party-Parrots-At-Sea.git synced 2026-05-09 14:28:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed bug

Browse Source 
#story[1250]
This commit is contained in:
William Muir
2017-09-11 15:24:42 +12:00
parent 0c4d001510
commit 334e13295f
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+9 -3
View File
@@ -396,11 +396,14 @@ public class GameState implements Runnable {
public static void checkCollision(ServerYacht serverYacht) { public static void checkCollision(ServerYacht serverYacht) {
//Yacht Collision //Yacht Collision
ServerYacht collidedYacht = checkYachtCollision(serverYacht); ServerYacht collidedYacht = checkYachtCollision(serverYacht);
Mark collidedMark = checkMarkCollision(serverYacht);
if (collidedYacht != null) { if (collidedYacht != null) {
GeoPoint originalLocation = serverYacht.getLocation(); GeoPoint originalLocation = serverYacht.getLocation();
serverYacht.setLocation( serverYacht.setLocation(
calculateBounceBack(serverYacht, originalLocation, BOUNCE_DISTANCE_YACHT) calculateBounceBack(serverYacht, originalLocation, BOUNCE_DISTANCE_YACHT)
); );
System.out.println("DID BOUNCE BACK");
serverYacht.setCurrentVelocity( serverYacht.setCurrentVelocity(
serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
); );
@@ -416,11 +419,12 @@ public class GameState implements Runnable {
} }
//Mark Collision //Mark Collision
Mark collidedMark = checkMarkCollision(serverYacht); else if (collidedMark != null) {
if (collidedMark != null) {
serverYacht.setLocation( serverYacht.setLocation(
calculateBounceBack(serverYacht, collidedMark, BOUNCE_DISTANCE_MARK) calculateBounceBack(serverYacht, collidedMark, BOUNCE_DISTANCE_MARK)
); );
System.out.println("DID BOUNCE BACK2");
serverYacht.setCurrentVelocity( serverYacht.setCurrentVelocity(
serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
); );
@@ -430,11 +434,13 @@ public class GameState implements Runnable {
} }
//Boundary Collision //Boundary Collision
if (checkBoundaryCollision(serverYacht)) { else if (checkBoundaryCollision(serverYacht)) {
serverYacht.setLocation( serverYacht.setLocation(
calculateBounceBack(serverYacht, serverYacht.getLocation(), calculateBounceBack(serverYacht, serverYacht.getLocation(),
BOUNCE_DISTANCE_YACHT) BOUNCE_DISTANCE_YACHT)
); );
System.out.println("DID BOUNCE BACK3");
serverYacht.setCurrentVelocity( serverYacht.setCurrentVelocity(
serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY serverYacht.getCurrentVelocity() * COLLISION_VELOCITY_PENALTY
); );