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

Added debugs for missing xml

Browse Source
This commit is contained in:
Calum
2017-09-27 02:50:36 +13:00
parent b18d9e8573
commit c0bd498f1b
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/gameServer/GameState.java
+1
View File
@@ -438,6 +438,7 @@ public class GameState implements Runnable {
serverYacht.powerUp(collidedToken.getTokenType());
logger.debug("Yacht: " + serverYacht.getShortName() + " got powerup " + collidedToken
.getTokenType());
System.out.println("AGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
notifyMessageListeners(MessageFactory.getRaceXML());
notifyMessageListeners(
new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.TOKEN));
src/main/java/seng302/gameServer/MainServerThread.java
+16 -5
View File
@@ -42,6 +42,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
private static Integer capacity;
private RaceXMLData raceXMLData;
private RegattaXMLData regattaXMLData;
private boolean serverStarted = false;
private void startAdvertisingServer() {
Integer capacity = GameState.getCapacity();
@@ -83,10 +84,12 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
GameState.setRace(raceXMLData);
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
startAdvertisingServer();
PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
PolarTable
.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
GameState.addMessageEventListener(this::broadcastMessage);
startUpdatingWind();
startSpawningTokens();
System.out.println("SAAAANNNNNNNNNDDDDDDDDDDDDDDDDDDDDDDDDDDdd");
sendSetupMessages();
}
@@ -101,6 +104,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
for (ServerToClientThread stc : serverToClientThreads) {
if (!stc.isSocketOpen()) {
GameState.getYachts().remove(stc.getSourceId());
System.out.println("AAAAAAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF");
sendSetupMessages();
try {
stc.getSocket().close();
@@ -118,6 +122,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
}
if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState.getCustomizationFlag()) {
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
System.out.println("gfdgfdgfdg");
sendSetupMessages();
GameState.resetCustomizationFlag();
}
@@ -255,7 +260,13 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
});
} else {
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
serverToClientThread.addConnectionListener(this::sendSetupMessages);
for (ServerYacht serverYacht : GameState.getYachts().values()) {
System.out.println("Connecterino" + serverYacht);
}
serverToClientThread.addConnectionListener(() -> {
System.out.println("LUSTENER");
sendSetupMessages();
});
}
serverToClientThreads.add(serverToClientThread);
serverToClientThread.addDisconnectListener(this::clientDisconnected);
@@ -317,9 +328,9 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
}, 0, 500);
if (GameState.getCurrentStage() == GameStages.LOBBYING) {
sendSetupMessages();
}
// if (GameState.getCurrentStage() == GameStages.LOBBYING) {
// sendSetupMessages();
// }
}
public void terminate() {
src/main/java/seng302/gameServer/ServerToClientThread.java
+4 -2
View File
@@ -108,10 +108,11 @@ public class ServerToClientThread implements Runnable {
ServerYacht yacht = new ServerYacht(
BoatMeshType.DINGHY, sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
);
System.out.println(yacht);
player = new Player(socket, yacht);
GameState.addYacht(sourceId, yacht);
GameState.addPlayer(player);
System.out.println(GameState.getYachts().size());
}
private void completeRegistration(ClientType clientType) throws IOException {
@@ -135,8 +136,9 @@ public class ServerToClientThread implements Runnable {
this.sourceId = sourceId;
isRegistered = true;
os.write(responseMessage.getBuffer());
System.out.println("MAKING A PLAYER");
setUpPlayer();
System.out.println("DONE MAKING A PLAYER");
for (ConnectionListener listener : connectionListeners) {
listener.notifyConnection();