@@ -1,6 +1,6 @@
|
||||
--- a/net/minecraft/server/LoginListener.java
|
||||
+++ b/net/minecraft/server/LoginListener.java
|
||||
@@ -18,6 +18,12 @@
|
||||
@@ -17,6 +17,12 @@
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
public class LoginListener implements PacketLoginInListener {
|
||||
|
||||
private static final AtomicInteger b = new AtomicInteger(0);
|
||||
@@ -32,6 +38,7 @@
|
||||
@@ -31,6 +37,7 @@
|
||||
private final String j;
|
||||
private SecretKey loginKey;
|
||||
private EntityPlayer l;
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
public LoginListener(MinecraftServer minecraftserver, NetworkManager networkmanager) {
|
||||
this.g = LoginListener.EnumProtocolState.HELLO;
|
||||
@@ -60,6 +67,20 @@
|
||||
@@ -59,6 +66,20 @@
|
||||
|
||||
}
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
@Override
|
||||
public NetworkManager a() {
|
||||
return this.networkManager;
|
||||
@@ -81,10 +102,12 @@
|
||||
@@ -80,10 +101,12 @@
|
||||
this.i = this.a(this.i);
|
||||
}
|
||||
|
||||
@@ -57,8 +57,8 @@
|
||||
+ // CraftBukkit end
|
||||
} else {
|
||||
this.g = LoginListener.EnumProtocolState.ACCEPTED;
|
||||
if (this.server.aA() >= 0 && !this.networkManager.isLocal()) {
|
||||
@@ -98,9 +121,9 @@
|
||||
if (this.server.av() >= 0 && !this.networkManager.isLocal()) {
|
||||
@@ -97,9 +120,9 @@
|
||||
|
||||
if (entityplayer != null) {
|
||||
this.g = LoginListener.EnumProtocolState.DELAY_ACCEPT;
|
||||
@@ -70,7 +70,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
@@ -148,6 +171,43 @@
|
||||
@@ -147,6 +170,43 @@
|
||||
|
||||
LoginListener.this.i = LoginListener.this.server.getMinecraftSessionService().hasJoinedServer(new GameProfile((UUID) null, gameprofile.getName()), s, this.a());
|
||||
if (LoginListener.this.i != null) {
|
||||
@@ -114,8 +114,8 @@
|
||||
LoginListener.LOGGER.info("UUID of player {} is {}", LoginListener.this.i.getName(), LoginListener.this.i.getId());
|
||||
LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT;
|
||||
} else if (LoginListener.this.server.isEmbeddedServer()) {
|
||||
@@ -167,6 +227,11 @@
|
||||
LoginListener.this.disconnect(new ChatMessage("multiplayer.disconnect.authservers_down", new Object[0]));
|
||||
@@ -166,6 +226,11 @@
|
||||
LoginListener.this.disconnect(new ChatMessage("multiplayer.disconnect.authservers_down"));
|
||||
LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable");
|
||||
}
|
||||
+ // CraftBukkit start - catch all exceptions
|
||||
|
||||
Reference in New Issue
Block a user