From bb7d367269db8e0abf04805ca2d12eaec9c8e43a Mon Sep 17 00:00:00 2001 From: Riley Park Date: Thu, 29 Nov 2018 16:32:23 -0800 Subject: [PATCH] Don't fill list with items on startup --- ...on-t-fill-list-with-items-on-startup.patch | 20 ++++++++++++++ ...-after-profile-lookups-if-not-needed.patch | 26 +++++++++---------- 2 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 Spigot-Server-Patches/Don-t-fill-list-with-items-on-startup.patch diff --git a/Spigot-Server-Patches/Don-t-fill-list-with-items-on-startup.patch b/Spigot-Server-Patches/Don-t-fill-list-with-items-on-startup.patch new file mode 100644 index 00000000000..f1c9bc1596a --- /dev/null +++ b/Spigot-Server-Patches/Don-t-fill-list-with-items-on-startup.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Riley Park +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 +@@ -0,0 +0,0 @@ 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; + } + } +-- \ No newline at end of file diff --git a/Spigot-Server-Patches/Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/Don-t-sleep-after-profile-lookups-if-not-needed.patch index 83275ab228a..3e96dbafbef 100644 --- a/Spigot-Server-Patches/Don-t-sleep-after-profile-lookups-if-not-needed.patch +++ b/Spigot-Server-Patches/Don-t-sleep-after-profile-lookups-if-not-needed.patch @@ -7,28 +7,28 @@ 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 @@ -0,0 +0,0 @@ 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; @@ -0,0 +0,0 @@ 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); -- \ No newline at end of file