Update to Minecraft 1.14.4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-07-20 09:00:00 +10:00
parent fa576e3e73
commit a4b8e8ce68
102 changed files with 678 additions and 751 deletions

View File

@@ -39,10 +39,10 @@
+ }
+ // CraftBukkit end
+
public void disconnect(IChatBaseComponent ichatbasecomponent) {
try {
LoginListener.LOGGER.info("Disconnecting {}: {}", this.d(), ichatbasecomponent.getString());
@@ -76,10 +97,12 @@
@Override
public NetworkManager a() {
return this.networkManager;
@@ -81,10 +102,12 @@
this.i = this.a(this.i);
}
@@ -57,8 +57,8 @@
+ // CraftBukkit end
} else {
this.g = LoginListener.EnumProtocolState.ACCEPTED;
if (this.server.ay() >= 0 && !this.networkManager.isLocal()) {
@@ -93,9 +116,9 @@
if (this.server.az() >= 0 && !this.networkManager.isLocal()) {
@@ -98,9 +121,9 @@
if (entityplayer != null) {
this.g = LoginListener.EnumProtocolState.DELAY_ACCEPT;
@@ -70,7 +70,7 @@
}
}
@@ -143,6 +166,43 @@
@@ -148,6 +171,43 @@
LoginListener.this.i = LoginListener.this.server.getMinecraftSessionService().hasJoinedServer(new GameProfile((UUID) null, gameprofile.getName()), s, this.a());
if (LoginListener.this.i != null) {
@@ -114,7 +114,7 @@
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()) {
@@ -162,6 +222,11 @@
@@ -167,6 +227,11 @@
LoginListener.this.disconnect(new ChatMessage("multiplayer.disconnect.authservers_down", new Object[0]));
LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable");
}