diff --git a/buildNumber.properties b/buildNumber.properties index 184963a6..04588389 100644 --- a/buildNumber.properties +++ b/buildNumber.properties @@ -1,3 +1,3 @@ #maven.buildNumber.plugin properties file -#Tue Aug 13 19:04:49 EDT 2024 -buildNumber=202 +#Thu Aug 15 18:38:57 EDT 2024 +buildNumber=204 diff --git a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java b/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java index 533cc62c..9829fee4 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/DebugSPWorldLoading.java @@ -44,7 +44,7 @@ public class DebugSPWorldLoading { //initialize the local connection Globals.clientUsername = "testuser"; Globals.clientPassword = AuthenticationManager.getHashedString("testpass"); - ServerConnectionHandler serverPlayerConnection = LoadingUtils.initLocalConnection(); + ServerConnectionHandler serverPlayerConnection = LoadingUtils.initLocalConnection(true); //wait for player object creation while(Globals.playerManager.getPlayers().size() < 1){ try { diff --git a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java b/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java index 62fda299..3f1378ac 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LevelEditorLoading.java @@ -72,7 +72,7 @@ public class LevelEditorLoading { //initialize the local connection Globals.clientUsername = "leveleditor"; Globals.clientPassword = AuthenticationManager.getHashedString("leveleditor"); - ServerConnectionHandler serverPlayerConnection = LoadingUtils.initLocalConnection(); + ServerConnectionHandler serverPlayerConnection = LoadingUtils.initLocalConnection(false); //wait for player object creation while(Globals.playerManager.getPlayers().size() < 1){ try { diff --git a/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java b/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java index 33167d10..8649f722 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LevelLoading.java @@ -42,7 +42,7 @@ public class LevelLoading { //initialize the local connection Globals.clientUsername = "leveleditor"; Globals.clientPassword = AuthenticationManager.getHashedString("leveleditor"); - ServerConnectionHandler serverPlayerConnection = LoadingUtils.initLocalConnection(); + ServerConnectionHandler serverPlayerConnection = LoadingUtils.initLocalConnection(true); //wait for player object creation while(Globals.playerManager.getPlayers().size() < 1){ try { diff --git a/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java b/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java index 5f56fcf7..7289d1f9 100644 --- a/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java +++ b/src/main/java/electrosphere/engine/loadingthreads/LoadingUtils.java @@ -87,10 +87,14 @@ public class LoadingUtils { } static final int STREAM_BUFFER_SIZE = 32 * 1024 * 1024; - static ServerConnectionHandler initLocalConnection(){ + static ServerConnectionHandler initLocalConnection(boolean runServerThread){ ServerConnectionHandler rVal = null; try { - Globals.server = new Server(NetUtils.getPort()); + if(runServerThread){ + LoadingUtils.initServerThread(); + } else { + Globals.server = new Server(NetUtils.getPort()); + } //client -> server pipe PipedInputStream clientInput = new PipedInputStream(STREAM_BUFFER_SIZE); PipedOutputStream serverOutput = new PipedOutputStream(clientInput); diff --git a/src/main/java/electrosphere/net/client/ClientNetworking.java b/src/main/java/electrosphere/net/client/ClientNetworking.java index 06ae9e59..544c5efc 100644 --- a/src/main/java/electrosphere/net/client/ClientNetworking.java +++ b/src/main/java/electrosphere/net/client/ClientNetworking.java @@ -129,7 +129,7 @@ public class ClientNetworking implements Runnable { this.socket = new Socket(address,port); connected = true; } catch (IOException ex) { - LoggerInterface.loggerNetworking.WARNING("Client failed to connect!"); + LoggerInterface.loggerNetworking.ERROR("Client failed to connect!", ex); } if(!connected){ try {