Fix round processing
This commit is contained in:
parent
1f65dc6dbd
commit
2fb6592306
@ -47,6 +47,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStatusChanged(int status, Object data) {
|
public void onStatusChanged(int status, Object data) {
|
||||||
|
System.out.println("move: " + serverMove);
|
||||||
if (serverInstance) serverNetworkStatus(status, data);
|
if (serverInstance) serverNetworkStatus(status, data);
|
||||||
else clientNetworkStatus(status, data);
|
else clientNetworkStatus(status, data);
|
||||||
}
|
}
|
||||||
@ -142,8 +143,8 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
else {
|
else {
|
||||||
if (serverInstance) {
|
if (serverInstance) {
|
||||||
long seed = System.currentTimeMillis();
|
long seed = System.currentTimeMillis();
|
||||||
socketHelper.sendNewRoundSeed(seed);
|
|
||||||
newRound(seed);
|
newRound(seed);
|
||||||
|
socketHelper.sendNewRoundSeed(seed);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -179,7 +180,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void shootComplete(boolean hitOpponent) {
|
public void shootComplete(boolean hitOpponent) {
|
||||||
serverMove = !serverMove;
|
serverMove = false;
|
||||||
if (hitOpponent) {
|
if (hitOpponent) {
|
||||||
finishRound(serverInstance);
|
finishRound(serverInstance);
|
||||||
}
|
}
|
||||||
@ -190,7 +191,7 @@ public class GameCanvas extends DoubleBufferedCanvas implements Runnable, Networ
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void shootComplete(boolean hitOpponent) {
|
public void shootComplete(boolean hitOpponent) {
|
||||||
serverMove = !serverMove;
|
serverMove = true;
|
||||||
if (hitOpponent) {
|
if (hitOpponent) {
|
||||||
finishRound(!serverInstance);
|
finishRound(!serverInstance);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user