eaglercraft/eaglercraft-1.5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug with multiplayer

Browse Source
This commit is contained in:
ayunami2000 2022-08-05 11:38:05 -04:00
parent 405a212c8b
commit 36c75ca4e1
4 changed files with 17242 additions and 17234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34465
javascript/classes.js
View File

File diff suppressed because one or more lines are too long

2
javascript/classes.js.map
View File

File diff suppressed because one or more lines are too long

5
src/main/java/net/lax1dude/eaglercraft/IntegratedServer.java
View File

@ -60,6 +60,11 @@ public class IntegratedServer {
return statusState == IntegratedState.WORLD_NONE; return statusState == IntegratedState.WORLD_NONE;
} }
public static boolean isWorldNotLoaded() {
return statusState == IntegratedState.WORLD_NONE || statusState == IntegratedState.WORLD_WORKER_NOT_RUNNING ||
statusState == IntegratedState.WORLD_WORKER_BOOTING;
}
public static boolean isWorldRunning() { public static boolean isWorldRunning() {
return statusState == IntegratedState.WORLD_LOADED || statusState == IntegratedState.WORLD_PAUSED || return statusState == IntegratedState.WORLD_LOADED || statusState == IntegratedState.WORLD_PAUSED ||
statusState == IntegratedState.WORLD_LOADING || statusState == IntegratedState.WORLD_SAVING; statusState == IntegratedState.WORLD_LOADING || statusState == IntegratedState.WORLD_SAVING;

2
src/main/java/net/minecraft/client/Minecraft.java
View File

@ -590,7 +590,7 @@ public class Minecraft implements Runnable {
} }
public void stopServerAndDisplayGuiScreen(GuiScreen par1GuiScreen) { public void stopServerAndDisplayGuiScreen(GuiScreen par1GuiScreen) {
if(!IntegratedServer.isReady()) { if(!IntegratedServer.isWorldNotLoaded()) {
IntegratedServer.unloadWorld(); IntegratedServer.unloadWorld();
displayGuiScreen(new GuiScreenSingleplayerLoading(par1GuiScreen, "saving world", () -> IntegratedServer.isReady())); displayGuiScreen(new GuiScreenSingleplayerLoading(par1GuiScreen, "saving world", () -> IntegratedServer.isReady()));
}else { }else {