Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 09:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appears to apply and compile correctly

Paper Changes:
3dafa6a0 Updated Upstream (CraftBukkit)
77b05b9c Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-02-03 04:33:26 -06:00
parent 853bcfb6de
commit 23d7b00d9c
16 changed files with 76 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0002-Bring-back-server-name.patch
View File

@@ -1,4 +1,4 @@
From c7a9cc3cca9498a9d55596b6941f5376f2e2b1bf Mon Sep 17 00:00:00 2001
From e51447a1efd39253f34151d4229b2f68ac2a4328 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sun, 26 May 2019 15:18:40 -0500
Subject: [PATCH] Bring back server name
@@ -9,10 +9,10 @@ Subject: [PATCH] Bring back server name
2 files changed, 20 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 388c2bbfa..e4d874557 100644
index 355bd2e22..79560dcca 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1605,6 +1605,17 @@ public final class Bukkit {
@@ -1619,6 +1619,17 @@ public final class Bukkit {
}
// Paper end
@@ -31,10 +31,10 @@ index 388c2bbfa..e4d874557 100644
public static Server.Spigot spigot() {
return server.spigot();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index a13717306..8179c7e72 100644
index 98e7ba900..863da99d4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1404,4 +1404,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1416,4 +1416,13 @@ public interface Server extends PluginMessageRecipient {
*/
int getCurrentTick();
// Paper end

10
patches/api/0012-Implement-lagging-threshold.patch
View File

@@ -1,4 +1,4 @@
From a16b381d7e18bf1f5bec89265dac170878e706f9 Mon Sep 17 00:00:00 2001
From 41324ce78820672bb1261893cceefd11d6022bd0 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Tue, 23 Jul 2019 10:07:24 -0500
Subject: [PATCH] Implement lagging threshold
@@ -9,10 +9,10 @@ Subject: [PATCH] Implement lagging threshold
2 files changed, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index e4d874557..c45a1161f 100644
index 79560dcca..5c39d73f2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1614,6 +1614,15 @@ public final class Bukkit {
@@ -1628,6 +1628,15 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -29,10 +29,10 @@ index e4d874557..c45a1161f 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8179c7e72..ec702f290 100644
index 863da99d4..88b7d606c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1412,5 +1412,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1424,5 +1424,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();

12
patches/api/0027-Remove-pointless-annotations-and-deprecations.patch
View File

@@ -1,4 +1,4 @@
From f9315e180c14b58252a214df391a8aebe9e7d13e Mon Sep 17 00:00:00 2001
From c1200033ce45f4a05561b8f86f3a354014471567 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 31 Dec 2019 23:00:07 -0600
Subject: [PATCH] Remove pointless annotations and deprecations
@@ -14,10 +14,10 @@ Subject: [PATCH] Remove pointless annotations and deprecations
7 files changed, 9 insertions(+), 18 deletions(-)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index b6f8942c0..ebb4ff682 100644
index 5c39d73f2..10d0537d0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -793,13 +793,10 @@ public final class Bukkit {
@@ -807,13 +807,10 @@ public final class Bukkit {
* This will return an object even if the player does not exist. To this
* method, all players will exist.
*
@@ -32,10 +32,10 @@ index b6f8942c0..ebb4ff682 100644
public static OfflinePlayer getOfflinePlayer(@NotNull String name) {
return server.getOfflinePlayer(name);
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ee768158b..fb85ad18a 100644
index 88b7d606c..97a981923 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -660,13 +660,10 @@ public interface Server extends PluginMessageRecipient {
@@ -672,13 +672,10 @@ public interface Server extends PluginMessageRecipient {
* This will return an object even if the player does not exist. To this
* method, all players will exist.
*
@@ -72,7 +72,7 @@ index e9cf71f5c..34d3462c7 100644
+ public List<String> onTabComplete(CommandSender sender, Command command, String alias, String[] args); // Purpur - remove pointless annotations
}
diff --git a/src/main/java/org/bukkit/inventory/ItemStack.java b/src/main/java/org/bukkit/inventory/ItemStack.java
index 5426e7c2f..cc324fe23 100644
index d7d6a3e83..cf8d77491 100644
--- a/src/main/java/org/bukkit/inventory/ItemStack.java
+++ b/src/main/java/org/bukkit/inventory/ItemStack.java
@@ -204,13 +204,7 @@ public class ItemStack implements Cloneable, ConfigurationSerializable {

10
patches/api/0029-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From e9c512e9e808d037a5d27906f2ed26439878b8e6 Mon Sep 17 00:00:00 2001
From ba6cb31517bc0cdeb1fb90caf3eb3bbc8d58c617 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Thu, 30 Jan 2020 00:41:08 -0600
Subject: [PATCH] Add tick times API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add tick times API
2 files changed, 34 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index f6076e94a..739934632 100644
index 10d0537d0..d49cf61b4 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1620,6 +1620,25 @@ public final class Bukkit {
@@ -1634,6 +1634,25 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -39,10 +39,10 @@ index f6076e94a..739934632 100644
@NotNull
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 22f6ac18a..efd7c87f1 100644
index 97a981923..f98c6a046 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1416,5 +1416,20 @@ public interface Server extends PluginMessageRecipient {
@@ -1428,5 +1428,20 @@ public interface Server extends PluginMessageRecipient {
* @return True if lagging
*/
boolean isLagging();