mirror of
https://github.com/michaelrausch/Party-Parrots-At-Sea.git
synced 2026-05-09 06:18:44 +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());
|
serverYacht.powerUp(collidedToken.getTokenType());
|
||||||
logger.debug("Yacht: " + serverYacht.getShortName() + " got powerup " + collidedToken
|
logger.debug("Yacht: " + serverYacht.getShortName() + " got powerup " + collidedToken
|
||||||
.getTokenType());
|
.getTokenType());
|
||||||
|
System.out.println("AGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG");
|
||||||
notifyMessageListeners(MessageFactory.getRaceXML());
|
notifyMessageListeners(MessageFactory.getRaceXML());
|
||||||
notifyMessageListeners(
|
notifyMessageListeners(
|
||||||
new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.TOKEN));
|
new YachtEventCodeMessage(serverYacht.getSourceId(), YachtEventType.TOKEN));
|
||||||
|
|||||||
@@ -42,6 +42,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
|
|||||||
private static Integer capacity;
|
private static Integer capacity;
|
||||||
private RaceXMLData raceXMLData;
|
private RaceXMLData raceXMLData;
|
||||||
private RegattaXMLData regattaXMLData;
|
private RegattaXMLData regattaXMLData;
|
||||||
|
private boolean serverStarted = false;
|
||||||
|
|
||||||
private void startAdvertisingServer() {
|
private void startAdvertisingServer() {
|
||||||
Integer capacity = GameState.getCapacity();
|
Integer capacity = GameState.getCapacity();
|
||||||
@@ -83,10 +84,12 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
|
|||||||
GameState.setRace(raceXMLData);
|
GameState.setRace(raceXMLData);
|
||||||
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
|
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
|
||||||
startAdvertisingServer();
|
startAdvertisingServer();
|
||||||
PolarTable.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
|
PolarTable
|
||||||
|
.parsePolarFile(getClass().getResourceAsStream("/server_config/acc_polars.csv"));
|
||||||
GameState.addMessageEventListener(this::broadcastMessage);
|
GameState.addMessageEventListener(this::broadcastMessage);
|
||||||
startUpdatingWind();
|
startUpdatingWind();
|
||||||
startSpawningTokens();
|
startSpawningTokens();
|
||||||
|
System.out.println("SAAAANNNNNNNNNDDDDDDDDDDDDDDDDDDDDDDDDDDdd");
|
||||||
sendSetupMessages();
|
sendSetupMessages();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,6 +104,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
|
|||||||
for (ServerToClientThread stc : serverToClientThreads) {
|
for (ServerToClientThread stc : serverToClientThreads) {
|
||||||
if (!stc.isSocketOpen()) {
|
if (!stc.isSocketOpen()) {
|
||||||
GameState.getYachts().remove(stc.getSourceId());
|
GameState.getYachts().remove(stc.getSourceId());
|
||||||
|
System.out.println("AAAAAAAFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF");
|
||||||
sendSetupMessages();
|
sendSetupMessages();
|
||||||
try {
|
try {
|
||||||
stc.getSocket().close();
|
stc.getSocket().close();
|
||||||
@@ -118,6 +122,7 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
|
|||||||
}
|
}
|
||||||
if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState.getCustomizationFlag()) {
|
if (GameState.getCurrentStage() == GameStages.LOBBYING && GameState.getCustomizationFlag()) {
|
||||||
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
|
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
|
||||||
|
System.out.println("gfdgfdgfdg");
|
||||||
sendSetupMessages();
|
sendSetupMessages();
|
||||||
GameState.resetCustomizationFlag();
|
GameState.resetCustomizationFlag();
|
||||||
}
|
}
|
||||||
@@ -255,7 +260,13 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
|
|||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
MessageFactory.updateBoats(new ArrayList<>(GameState.getYachts().values()));
|
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);
|
serverToClientThreads.add(serverToClientThread);
|
||||||
serverToClientThread.addDisconnectListener(this::clientDisconnected);
|
serverToClientThread.addDisconnectListener(this::clientDisconnected);
|
||||||
@@ -317,9 +328,9 @@ public class MainServerThread implements Runnable, ClientConnectionDelegate {
|
|||||||
}, 0, 500);
|
}, 0, 500);
|
||||||
|
|
||||||
|
|
||||||
if (GameState.getCurrentStage() == GameStages.LOBBYING) {
|
// if (GameState.getCurrentStage() == GameStages.LOBBYING) {
|
||||||
sendSetupMessages();
|
// sendSetupMessages();
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public void terminate() {
|
public void terminate() {
|
||||||
|
|||||||
@@ -108,10 +108,11 @@ public class ServerToClientThread implements Runnable {
|
|||||||
ServerYacht yacht = new ServerYacht(
|
ServerYacht yacht = new ServerYacht(
|
||||||
BoatMeshType.DINGHY, sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
|
BoatMeshType.DINGHY, sourceId, sourceId.toString(), fName, fName + " " + lName, "NZ"
|
||||||
);
|
);
|
||||||
|
System.out.println(yacht);
|
||||||
player = new Player(socket, yacht);
|
player = new Player(socket, yacht);
|
||||||
GameState.addYacht(sourceId, yacht);
|
GameState.addYacht(sourceId, yacht);
|
||||||
GameState.addPlayer(player);
|
GameState.addPlayer(player);
|
||||||
|
System.out.println(GameState.getYachts().size());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void completeRegistration(ClientType clientType) throws IOException {
|
private void completeRegistration(ClientType clientType) throws IOException {
|
||||||
@@ -135,8 +136,9 @@ public class ServerToClientThread implements Runnable {
|
|||||||
this.sourceId = sourceId;
|
this.sourceId = sourceId;
|
||||||
isRegistered = true;
|
isRegistered = true;
|
||||||
os.write(responseMessage.getBuffer());
|
os.write(responseMessage.getBuffer());
|
||||||
|
System.out.println("MAKING A PLAYER");
|
||||||
setUpPlayer();
|
setUpPlayer();
|
||||||
|
System.out.println("DONE MAKING A PLAYER");
|
||||||
|
|
||||||
for (ConnectionListener listener : connectionListeners) {
|
for (ConnectionListener listener : connectionListeners) {
|
||||||
listener.notifyConnection();
|
listener.notifyConnection();
|
||||||
|
|||||||
@@ -136,7 +136,7 @@ public class StreamParser {
|
|||||||
long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
|
long messageLength = bytesToLong(Arrays.copyOfRange(payload, 12, 14));
|
||||||
String xmlMessage = new String(
|
String xmlMessage = new String(
|
||||||
(Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
|
(Arrays.copyOfRange(payload, 14, (int) (14 + messageLength)))).trim();
|
||||||
|
System.out.println(xmlMessage);
|
||||||
//Create XML document Object
|
//Create XML document Object
|
||||||
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
|
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
|
||||||
DocumentBuilder db;
|
DocumentBuilder db;
|
||||||
|
|||||||
@@ -214,6 +214,7 @@ public class GameClient {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case RACE_XML:
|
case RACE_XML:
|
||||||
|
System.out.println("HEY I GOT A RACE MANG AND I AM CLIENT " + ((Boolean) (server==null)).toString());
|
||||||
RaceXMLData raceXMLData = XMLParser.parseRace(
|
RaceXMLData raceXMLData = XMLParser.parseRace(
|
||||||
StreamParser.extractXmlMessage(packet)
|
StreamParser.extractXmlMessage(packet)
|
||||||
);
|
);
|
||||||
|
|||||||
Reference in New Issue
Block a user