From 3ef68e5f204d4cfe24ed5b5e2b7674c054d62d21 Mon Sep 17 00:00:00 2001 From: kashike Date: Fri, 30 Nov 2018 07:40:47 -0800 Subject: [PATCH] nevermind then --- ...-after-profile-lookups-if-not-needed.patch | 28 +++++++++---------- ...on-t-fill-list-with-items-on-startup.patch | 22 --------------- 2 files changed, 14 insertions(+), 36 deletions(-) delete mode 100644 Spigot-Server-Patches/0416-Don-t-fill-list-with-items-on-startup.patch diff --git a/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch index 4ddaa229b6..d6bcb9aeab 100644 --- a/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/0399-Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -1,4 +1,4 @@ -From 202d3b30d84fa38f2d97a0f8854ebd947826baad Mon Sep 17 00:00:00 2001 +From d92a33da313b20dcf7bfcf7a9070c403e961444e Mon Sep 17 00:00:00 2001 From: Aikar Date: Tue, 23 Oct 2018 20:25:05 -0400 Subject: [PATCH] Don't sleep after profile lookups if not needed @@ -7,30 +7,30 @@ Mojang was sleeping even if we had no more requests to go after the current one finished, resulting in 100ms lost per profile lookup diff --git a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java -index 71e48e87b..23f1447cf 100644 +index 26a743722..6ed3199c3 100644 --- a/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java +++ b/src/main/java/com/mojang/authlib/yggdrasil/YggdrasilGameProfileRepository.java @@ -42,6 +42,7 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository { - } - - final int page = 0; + } + + final int page = 0; + boolean hasRequested = false; // Paper - - for (final List request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) { - int failCount = 0; + + for (final List request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) { + int failCount = 0; @@ -67,6 +68,12 @@ public class YggdrasilGameProfileRepository implements GameProfileRepository { - LOGGER.debug("Couldn't find profile {}", name); - callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile")); - } + LOGGER.debug("Couldn't find profile {}", name); + callback.onProfileLookupFailed(new GameProfile(null, name), new ProfileNotFoundException("Server did not find the requested profile")); + } + // Paper start + if (!hasRequested) { + hasRequested = true; + continue; + } + // Paper end - - try { - Thread.sleep(DELAY_BETWEEN_PAGES); + + try { + Thread.sleep(DELAY_BETWEEN_PAGES); -- 2.19.2 diff --git a/Spigot-Server-Patches/0416-Don-t-fill-list-with-items-on-startup.patch b/Spigot-Server-Patches/0416-Don-t-fill-list-with-items-on-startup.patch deleted file mode 100644 index d9f8742494..0000000000 --- a/Spigot-Server-Patches/0416-Don-t-fill-list-with-items-on-startup.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7b6131237760dc3eced1d858a97a2d73bd9cdfd4 Mon Sep 17 00:00:00 2001 -From: kashike -Date: Thu, 29 Nov 2018 16:32:03 -0800 -Subject: [PATCH] Don't fill list with items on startup - - -diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java -index bec7748ea..1afe018ff 100644 ---- a/src/main/java/net/minecraft/server/DedicatedServer.java -+++ b/src/main/java/net/minecraft/server/DedicatedServer.java -@@ -367,7 +367,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer - thread1.start(); - } - -- Items.AIR.a(CreativeModeTab.g, NonNullList.a()); -+ // Items.AIR.a(CreativeModeTab.g, NonNullList.a()); // Paper - comment - return true; - } - } --- -2.19.2 -