From a55f66b6078248325fc64c83376ee9393d9c7e44 Mon Sep 17 00:00:00 2001
From: Zach Brown <1254957+zachbr@users.noreply.github.com>
Date: Tue, 21 Jan 2020 20:12:53 -0600
Subject: [PATCH] Update upstream CB
--- work/CraftBukkit
Submodule work/CraftBukkit 29737ccb..efd6cf55:
> Only load legacy support data if something uses it
---
.../Add-CraftMagicNumbers.isSupportedApiVersion.patch | 2 +-
Spigot-Server-Patches/Implement-Paper-VersionChecker.patch | 2 +-
Spigot-Server-Patches/Timings-v2.patch | 2 +-
work/CraftBukkit | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch b/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch
index b3da443633..41047fc222 100644
--- a/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch
+++ b/Spigot-Server-Patches/Add-CraftMagicNumbers.isSupportedApiVersion.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion()
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 9fed3cd5d..9d4b76d4a 100644
+index 919892106..6a6e4fe48 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch b/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch
index 56199cb7f4..d1423e5e48 100644
--- a/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch
+++ b/Spigot-Server-Patches/Implement-Paper-VersionChecker.patch
@@ -126,7 +126,7 @@ index 000000000..5deed3e25
+ }
+}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 50a69e4cb..9fed3cd5d 100644
+index 1c719ec0e..919892106 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/Spigot-Server-Patches/Timings-v2.patch b/Spigot-Server-Patches/Timings-v2.patch
index 37d05e5707..fc18dfc38b 100644
--- a/Spigot-Server-Patches/Timings-v2.patch
+++ b/Spigot-Server-Patches/Timings-v2.patch
@@ -1768,7 +1768,7 @@ index e52ef47b7..3d90b3426 100644
this.value = value;
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index 1860fbb1b..50a69e4cb 100644
+index afe4004ff..1c719ec0e 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -0,0 +0,0 @@ public final class CraftMagicNumbers implements UnsafeValues {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 29737ccbd2..efd6cf55fc 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 29737ccbd2a184f893f102618ac2b64261bff8d9
+Subproject commit efd6cf55fc925d15ba0961f2457e8ae5b88cc718