Fix disconnection crash
This commit is contained in:
parent
ec2fbed8d1
commit
656f3ce628
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="CompilerConfiguration">
|
<component name="CompilerConfiguration">
|
||||||
<bytecodeTargetLevel target="18" />
|
<bytecodeTargetLevel target="17" />
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
|
@ -1,5 +1,5 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_18" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="corretto-18" project-jdk-type="JavaSDK" />
|
||||||
</project>
|
</project>
|
Binary file not shown.
95204
javascript/classes.js
95204
javascript/classes.js
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
@ -1446,6 +1446,8 @@ public class Minecraft
|
||||||
displayEaglercraftText("Note: " + var4.translateKey("fancyGraphicsNote"));
|
displayEaglercraftText("Note: " + var4.translateKey("fancyGraphicsNote"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
displayEaglercraftText("Warning: world loading may take a while, so you may need to wait for a few seconds for the world to load and the lag will stop.");
|
||||||
|
|
||||||
if(this.gameSettings.showCoordinates) {
|
if(this.gameSettings.showCoordinates) {
|
||||||
displayEaglercraftText(EnumChatFormatting.LIGHT_PURPLE + "Note: use F+6 to hide the coordinates off of the screen (if you're in public)");
|
displayEaglercraftText(EnumChatFormatting.LIGHT_PURPLE + "Note: use F+6 to hide the coordinates off of the screen (if you're in public)");
|
||||||
}else {
|
}else {
|
||||||
|
|
|
@ -9,10 +9,8 @@ public class Packet252SharedKey extends Packet
|
||||||
private byte[] sharedSecret = new byte[0];
|
private byte[] sharedSecret = new byte[0];
|
||||||
private byte[] verifyToken = new byte[0];
|
private byte[] verifyToken = new byte[0];
|
||||||
|
|
||||||
public Packet252SharedKey() {}
|
public Packet252SharedKey() {
|
||||||
|
|
||||||
public Packet252SharedKey(Object par1SecretKey, Object par2PublicKey, byte[] par3ArrayOfByte)
|
|
||||||
{
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -69,7 +69,7 @@ public class Client {
|
||||||
crashScreenOptsDump = "window.eaglercraftOpts = " + conf.toString();
|
crashScreenOptsDump = "window.eaglercraftOpts = " + conf.toString();
|
||||||
}
|
}
|
||||||
String serverWorkerURI = conf.optString("serverWorkerURI", null);
|
String serverWorkerURI = conf.optString("serverWorkerURI", null);
|
||||||
EaglerAdapterImpl2.setWorldDatabaseName(conf.optString("worldsFolder", "MAIN"));
|
//EaglerAdapterImpl2.setWorldDatabaseName(conf.optString("worldsFolder", "MAIN"));
|
||||||
|
|
||||||
registerErrorHandler();
|
registerErrorHandler();
|
||||||
|
|
||||||
|
|
|
@ -413,8 +413,8 @@ public class EaglerAdapterImpl2 {
|
||||||
|
|
||||||
EarlyLoadScreen.paintScreen();
|
EarlyLoadScreen.paintScreen();
|
||||||
|
|
||||||
voiceClient = startVoiceClient();
|
//voiceClient = startVoiceClient();
|
||||||
rtcLANClient = startRTCLANClient();
|
//rtcLANClient = startRTCLANClient();
|
||||||
|
|
||||||
//todo: safely skip startRTCLANServer() if the integrated server is disabled:
|
//todo: safely skip startRTCLANServer() if the integrated server is disabled:
|
||||||
|
|
||||||
|
@ -4106,7 +4106,7 @@ public class EaglerAdapterImpl2 {
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final void serverLANCloseServer() {
|
public static final void serverLANCloseServer() {
|
||||||
rtcLANServer.signalRemoteDisconnect("");
|
//rtcLANServer.signalRemoteDisconnect("");
|
||||||
}
|
}
|
||||||
|
|
||||||
public static final LANPeerEvent serverLANGetEvent(String clientId) {
|
public static final LANPeerEvent serverLANGetEvent(String clientId) {
|
||||||
|
|
Loading…
Reference in New Issue