From c832bed57d2e68d7f5fdb746cd1b3f1461abaec0 Mon Sep 17 00:00:00 2001 From: Aikar Date: Fri, 31 Aug 2018 11:51:41 -0400 Subject: [PATCH] Pull the last upstream updates --- .../Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch | 2 +- .../Allow-specifying-a-custom-authentication-servers-dow.patch | 2 +- Spigot-Server-Patches/Cache-user-authenticator-threads.patch | 2 +- Spigot-Server-Patches/Player.setPlayerProfile-API.patch | 2 +- work/CraftBukkit | 2 +- work/Spigot | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Spigot-Server-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch b/Spigot-Server-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch index 6dce84c01c..7dc93d790a 100644 --- a/Spigot-Server-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch +++ b/Spigot-Server-Patches/Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent This will allow you to change the players name or skin on login. diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index eaac25dc3..2842956bf 100644 +index b1ab83648..26a366375 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -0,0 +0,0 @@ diff --git a/Spigot-Server-Patches/Allow-specifying-a-custom-authentication-servers-dow.patch b/Spigot-Server-Patches/Allow-specifying-a-custom-authentication-servers-dow.patch index c18af0d441..8f3ecaf9c3 100644 --- a/Spigot-Server-Patches/Allow-specifying-a-custom-authentication-servers-dow.patch +++ b/Spigot-Server-Patches/Allow-specifying-a-custom-authentication-servers-dow.patch @@ -27,7 +27,7 @@ index dbafef023..ec89ecfca 100644 + } } diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index c5434e6ba..75df92836 100644 +index c9533c181..1a67196b4 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable { diff --git a/Spigot-Server-Patches/Cache-user-authenticator-threads.patch b/Spigot-Server-Patches/Cache-user-authenticator-threads.patch index ac16d4474f..236ff5ef5a 100644 --- a/Spigot-Server-Patches/Cache-user-authenticator-threads.patch +++ b/Spigot-Server-Patches/Cache-user-authenticator-threads.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Cache user authenticator threads diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 57f728567..2158fcd32 100644 +index 2619adde2..8d1555a21 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable { diff --git a/Spigot-Server-Patches/Player.setPlayerProfile-API.patch b/Spigot-Server-Patches/Player.setPlayerProfile-API.patch index f347fda3cc..352ae78bf5 100644 --- a/Spigot-Server-Patches/Player.setPlayerProfile-API.patch +++ b/Spigot-Server-Patches/Player.setPlayerProfile-API.patch @@ -19,7 +19,7 @@ index 4b82e43a8..35fde8b23 100644 private final ItemCooldown bW; @Nullable diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java -index 2842956bf..8aeded425 100644 +index 26a366375..be43d9292 100644 --- a/src/main/java/net/minecraft/server/LoginListener.java +++ b/src/main/java/net/minecraft/server/LoginListener.java @@ -0,0 +0,0 @@ public class LoginListener implements PacketLoginInListener, ITickable { diff --git a/work/CraftBukkit b/work/CraftBukkit index 57ab4cfc6f..2b93d839dd 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit 57ab4cfc6f4ff526d44319d9b8c79f6848db2de7 +Subproject commit 2b93d839ddb1541cad937e3dd7a4da5d1525af3d diff --git a/work/Spigot b/work/Spigot index 642f6d2288..2cf50f0552 160000 --- a/work/Spigot +++ b/work/Spigot @@ -1 +1 @@ -Subproject commit 642f6d2288b830f41347e8c0a162fbc0584e1579 +Subproject commit 2cf50f055260acaa2344390334bbca546d46726d