diff options
| author | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-05 21:43:47 +0100 |
|---|---|---|
| committer | Thinkofdeath <thinkofdeath@spigotmc.org> | 2015-05-17 10:32:59 +0100 |
| commit | a48660074969c52ed2547e02981d224b696f93e2 (patch) | |
| tree | fac414d927c9edfae7b91ed7e698f294ff3b700b /nms-patches/LoginListener.patch | |
| parent | 0a645a2726f031cc2d2c2a801574021283cf50ee (diff) | |
| download | craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.gz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.lz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.tar.xz craftbukkit-a48660074969c52ed2547e02981d224b696f93e2.zip | |
Update to 1.8.4
Diffstat (limited to 'nms-patches/LoginListener.patch')
| -rw-r--r-- | nms-patches/LoginListener.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/LoginListener.patch b/nms-patches/LoginListener.patch index c9be91fe..54012dd6 100644 --- a/nms-patches/LoginListener.patch +++ b/nms-patches/LoginListener.patch @@ -1,5 +1,5 @@ ---- /home/matt/mc-dev-private//net/minecraft/server/LoginListener.java 2015-02-26 22:40:22.867608136 +0000 -+++ src/main/java/net/minecraft/server/LoginListener.java 2015-02-26 22:40:22.867608136 +0000 +--- /home/matt/mc-dev-private//net/minecraft/server/LoginListener.java 2015-05-05 21:41:20.964634428 +0100 ++++ src/main/java/net/minecraft/server/LoginListener.java 2015-05-05 21:41:20.968634369 +0100 @@ -18,6 +18,12 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -36,9 +36,9 @@ + // CraftBukkit end } else { this.g = LoginListener.EnumProtocolState.ACCEPTED; - if (this.server.aJ() >= 0 && !this.networkManager.c()) { + if (this.server.aK() >= 0 && !this.networkManager.c()) { @@ -90,7 +99,7 @@ - LoginListener.this.networkManager.a(LoginListener.this.server.aJ()); + LoginListener.this.networkManager.a(LoginListener.this.server.aK()); } - public void operationComplete(Future future) throws Exception { @@ -60,7 +60,7 @@ @@ -148,6 +157,43 @@ - LoginListener.this.i = LoginListener.this.server.aC().hasJoinedServer(new GameProfile((UUID) null, gameprofile.getName()), s); + LoginListener.this.i = LoginListener.this.server.aD().hasJoinedServer(new GameProfile((UUID) null, gameprofile.getName()), s); if (LoginListener.this.i != null) { + // CraftBukkit start - fire PlayerPreLoginEvent + if (!networkManager.g()) { @@ -101,7 +101,7 @@ + // CraftBukkit end LoginListener.c.info("UUID of player " + LoginListener.this.i.getName() + " is " + LoginListener.this.i.getId()); LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT; - } else if (LoginListener.this.server.S()) { + } else if (LoginListener.this.server.T()) { @@ -156,7 +202,7 @@ LoginListener.this.g = LoginListener.EnumProtocolState.READY_TO_ACCEPT; } else { @@ -110,7 +110,7 @@ + LoginListener.c.error("Username \'" + gameprofile.getName() + "\' tried to join with an invalid session"); // CraftBukkit - fix null pointer } } catch (AuthenticationUnavailableException authenticationunavailableexception) { - if (LoginListener.this.server.S()) { + if (LoginListener.this.server.T()) { @@ -167,6 +213,11 @@ LoginListener.this.disconnect("Authentication servers are down. Please try again later, sorry!"); LoginListener.c.error("Couldn\'t verify username because servers are unavailable"); |