mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update upstream CB

Browse source 
--- work/CraftBukkit
Submodule work/CraftBukkit 29737ccb..efd6cf55:
  > Only load legacy support data if something uses it
This commit is contained in:
Zach Brown 2020-01-21 20:12:53 -06:00
parent 19de9af63c
commit 79710332e3
No known key found for this signature in database
GPG key ID: CC9DA35FC5450B76
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Spigot-Server-Patches/0009-Timings-v2.patch
View file

@ -1,4 +1,4 @@
From 52f1636755ebeb48bcb0cd8d32f529e63ca13313 Mon Sep 17 00:00:00 2001 From ce5ca10c801e990f0f814a775ff9f8d35b82bb1b Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co> From: Aikar <aikar@aikar.co>
Date: Thu, 3 Mar 2016 04:00:11 -0600 Date: Thu, 3 Mar 2016 04:00:11 -0600
Subject: [PATCH] Timings v2 Subject: [PATCH] Timings v2
@ -1768,10 +1768,10 @@ index e52ef47b7..3d90b3426 100644
this.value = value; 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 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 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -288,6 +288,13 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -290,6 +290,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
return clazz; return clazz;
} }
@ -1847,5 +1847,5 @@ index ca7789b5e..442383969 100644
} }
} }
-- --
2.25.0.windows.1 2.25.0

8
Spigot-Server-Patches/0018-Implement-Paper-VersionChecker.patch
View file

@ -1,4 +1,4 @@
From bac68a867c1c4a2bb7b52bba4068b106a274fcc0 Mon Sep 17 00:00:00 2001 From 2f074ced2abd0a06240e695b6d734e9a607be80b Mon Sep 17 00:00:00 2001
From: Zach Brown <zach@zachbr.io> From: Zach Brown <zach@zachbr.io>
Date: Mon, 27 May 2019 03:40:05 -0500 Date: Mon, 27 May 2019 03:40:05 -0500
Subject: [PATCH] Implement Paper VersionChecker Subject: [PATCH] Implement Paper VersionChecker
@ -126,10 +126,10 @@ 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 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 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -293,6 +293,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -295,6 +295,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
public String getTimingsServerName() { public String getTimingsServerName() {
return com.destroystokyo.paper.PaperConfig.timingsServerName; return com.destroystokyo.paper.PaperConfig.timingsServerName;
} }
@ -142,5 +142,5 @@ index 50a69e4cb..9fed3cd5d 100644
/** /**
-- --
2.25.0.windows.1 2.25.0

8
Spigot-Server-Patches/0415-Add-CraftMagicNumbers.isSupportedApiVersion.patch
View file

@ -1,14 +1,14 @@
From 58758799789741b0d6dc9bc14fbe493a8fd85101 Mon Sep 17 00:00:00 2001 From f7e36c12bf727ec05cf8c0d160da894024f7176d Mon Sep 17 00:00:00 2001
From: BlackHole <black-hole@live.com> From: BlackHole <black-hole@live.com>
Date: Sun, 15 Dec 2019 19:12:39 +0100 Date: Sun, 15 Dec 2019 19:12:39 +0100
Subject: [PATCH] Add CraftMagicNumbers.isSupportedApiVersion() 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 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 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -298,6 +298,11 @@ public final class CraftMagicNumbers implements UnsafeValues { @@ -300,6 +300,11 @@ public final class CraftMagicNumbers implements UnsafeValues {
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() { public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
return new com.destroystokyo.paper.PaperVersionFetcher(); return new com.destroystokyo.paper.PaperVersionFetcher();
} }
@ -21,5 +21,5 @@ index 9fed3cd5d..9d4b76d4a 100644
/** /**
-- --
2.25.0.windows.1 2.25.0

2
work/CraftBukkit

@ -1 +1 @@
Subproject commit 29737ccbd2a184f893f102618ac2b64261bff8d9 Subproject commit efd6cf55fc925d15ba0961f2457e8ae5b88cc718