From e952f6ebe2d3d52297da59278b9bc58d8619b7c9 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 6 Feb 2019 02:19:49 +0000
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
43b46cbd SPIGOT-4608: Improve quality of MapMeta APIs

CraftBukkit Changes:
c7ba9790 Fix incorrect method descriptor in previous commit
3d19f011 SPIGOT-4608: Improve quality of MapMeta APIs
---
 .../0375-Hook-into-CB-plugin-rewrites.patch   |  6 ++--
 ...-after-profile-lookups-if-not-needed.patch | 28 +++++++++----------
 work/Bukkit                                   |  2 +-
 work/CraftBukkit                              |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Spigot-Server-Patches/0375-Hook-into-CB-plugin-rewrites.patch b/Spigot-Server-Patches/0375-Hook-into-CB-plugin-rewrites.patch
index 4905daeaad..ae478ac2ca 100644
--- a/Spigot-Server-Patches/0375-Hook-into-CB-plugin-rewrites.patch
+++ b/Spigot-Server-Patches/0375-Hook-into-CB-plugin-rewrites.patch
@@ -1,4 +1,4 @@
-From 7ca3999002551b397d6ae130a28be6ec90f218bb Mon Sep 17 00:00:00 2001
+From ba6c0b9c1fcab6a9a75d54773971d60644ecff98 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 875b4f77c3..93e09e42fa 100644
+index 632df2270..b66323220 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
@@ -171,7 +171,7 @@ index 875b4f77c3..93e09e42fa 100644
                          if ( modern )
                          {
                              super.visitFieldInsn( opcode, owner, name, desc );
-@@ -207,6 +325,14 @@ public class Commodore
+@@ -214,6 +332,14 @@ public class Commodore
                              return;
                          }
  
diff --git a/Spigot-Server-Patches/0392-Don-t-sleep-after-profile-lookups-if-not-needed.patch b/Spigot-Server-Patches/0392-Don-t-sleep-after-profile-lookups-if-not-needed.patch
index 151e935458..6f1cfc4840 100644
--- a/Spigot-Server-Patches/0392-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0392-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@@ -1,4 +1,4 @@
-From 87abc431c2c2e1ec2e3c5d1f2922455c784771a3 Mon Sep 17 00:00:00 2001
+From a8f8a54a79674d324c92a164bd27836c3eb19757 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 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<String> request : Iterables.partition(criteria, ENTRIES_PER_PAGE)) {
-             int failCount = 0;
+ 
+         for (final List<String> 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.20.1
 
diff --git a/work/Bukkit b/work/Bukkit
index bb813f6f69..43b46cbdc5 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit bb813f6f69028b8effd085244d33fec70cbb30f9
+Subproject commit 43b46cbdc5d9c08fbcf6af901398d3952cf51639
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 2ced02339a..c7ba97906c 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 2ced02339aeb75e0c59014b1543e75f85f3dac36
+Subproject commit c7ba97906c10958c8a5b8c08dc1cd47ea22369a8