mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 14:28:43 +00:00
Added debugs for missing xml
This commit is contained in:
@@ -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));
|
||||
|
||||
@@ -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() {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -136,7 +136,7 @@ public class StreamParser {
|
||||
long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
|
||||
String xmlMessage = new String(
|
||||
(Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
|
||||
|
||||
System.out.println(xmlMessage);
|
||||
//Create XML document Object
|
||||
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
|
||||
DocumentBuilder db;
|
||||
|
||||
@@ -214,6 +214,7 @@ public class GameClient {
|
||||
break;
|
||||
|
||||
case RACE_XML:
|
||||
System.out.println("HEY I GOT A RACE MANG AND I AM CLIENT " + ((Boolean) (server==null)).toString());
|
||||
RaceXMLData raceXMLData = XMLParser.parseRace(
|
||||
StreamParser.extractXmlMessage(packet)
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user