Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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:
932e97f3 Rename to AsyncPlayerSendSuggestionsEvent to be consistent in naming
0dd19075 AsyncSendPlayerSuggestionsEvent Brigadier Event
a9e20e5f Fix being kicked in survival for block picking - Fixes #3277
4d20537e Expose game version (#3274)
85fb0015 Validate PickItem Packet and kick for invalid - Fixes #3256
5729bc71 Special case Keep Alive packets from Anti Xray
a76b7740 Improved oversized chunk data packet handling
a6f78170 Use Vanilla Bed Search for non players (Villagers)
68fb98b5 Fix 2 plugin specific issues with loot drop and pathfinders
6e41f7b7 Update Activation Range 2.0 with more villager controls
57dd3971 Updated Upstream (Bukkit/CraftBukkit)
This commit is contained in:
William Blake Galbreath
2020-05-02 21:01:38 -05:00
parent be3ee18320
commit 4d42781bdd
19 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/api/0002-Purpur-config-files.patch
View File

@@ -1,4 +1,4 @@
From 748ec8f720ad952d784ed4e3931d4c9a9de1c17c Mon Sep 17 00:00:00 2001
From 23500f1f8f5d8e17be4b8e14b2ec52638b2db889 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Tue, 18 Feb 2020 20:30:03 -0600
Subject: [PATCH] Purpur config files
@@ -9,7 +9,7 @@ Subject: [PATCH] Purpur config files
2 files changed, 32 insertions(+), 3 deletions(-)
diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
index 93d5a3f97..5e7e10c8f 100644
index 93d5a3f9..5e7e10c8 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -204,9 +204,13 @@ class TimingsExport extends Thread {
@@ -50,10 +50,10 @@ index 93d5a3f97..5e7e10c8f 100644
JSONObject object = new JSONObject();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 9ceaac0e8..20fe14213 100644
index c3fb1c27..79543106 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1386,6 +1386,18 @@ public interface Server extends PluginMessageRecipient {
@@ -1396,6 +1396,18 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end

20
patches/api/0005-Remove-pointless-annotations-and-deprecations.patch
View File

@@ -1,4 +1,4 @@
From 89b558740be091a89cafc861442b18d114fd2626 Mon Sep 17 00:00:00 2001
From b635caa251ca2fe802bfe3ff6c967971a2b88b93 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 b99734068..3a60094a1 100644
index 95ad0122..5d42cf62 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -851,13 +851,10 @@ public final class Bukkit {
@@ -863,13 +863,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 b99734068..3a60094a1 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 eaaf9a4e9..e8b2fe0c2 100644
index 79543106..aabf82b5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -712,13 +712,10 @@ public interface Server extends PluginMessageRecipient {
@@ -722,13 +722,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.
*
@@ -50,7 +50,7 @@ index eaaf9a4e9..e8b2fe0c2 100644
public OfflinePlayer getOfflinePlayer(@NotNull String name);
diff --git a/src/main/java/org/bukkit/command/CommandExecutor.java b/src/main/java/org/bukkit/command/CommandExecutor.java
index 45cb8da12..383b43e1b 100644
index 45cb8da1..383b43e1 100644
--- a/src/main/java/org/bukkit/command/CommandExecutor.java
+++ b/src/main/java/org/bukkit/command/CommandExecutor.java
@@ -19,5 +19,5 @@ public interface CommandExecutor {
@@ -61,7 +61,7 @@ index 45cb8da12..383b43e1b 100644
+ public boolean onCommand(CommandSender sender, Command command, String label, String[] args); // Purpur - remove pointless annotations
}
diff --git a/src/main/java/org/bukkit/command/TabCompleter.java b/src/main/java/org/bukkit/command/TabCompleter.java
index e9cf71f5c..34d3462c7 100644
index e9cf71f5..34d3462c 100644
--- a/src/main/java/org/bukkit/command/TabCompleter.java
+++ b/src/main/java/org/bukkit/command/TabCompleter.java
@@ -23,5 +23,5 @@ public interface TabCompleter {
@@ -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 d7d6a3e83..cf8d77491 100644
index d7d6a3e8..cf8d7749 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 {
@@ -100,7 +100,7 @@ index d7d6a3e83..cf8d77491 100644
ItemMeta meta = getItemMeta();
return (meta == null) ? 0 : (short) ((Damageable) meta).getDamage();
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
index 04fa3991f..24d65491c 100644
index 04fa3991..24d65491 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPlugin.java
@@ -287,7 +287,7 @@ public abstract class JavaPlugin extends PluginBase {
@@ -122,7 +122,7 @@ index 04fa3991f..24d65491c 100644
}
diff --git a/src/test/java/org/bukkit/AnnotationTest.java b/src/test/java/org/bukkit/AnnotationTest.java
index a48be38b1..951b81e79 100644
index a48be38b..951b81e7 100644
--- a/src/test/java/org/bukkit/AnnotationTest.java
+++ b/src/test/java/org/bukkit/AnnotationTest.java
@@ -41,6 +41,11 @@ public class AnnotationTest {

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

@@ -1,4 +1,4 @@
From 3635012280c234231d996c604d2ec76269c67dd7 Mon Sep 17 00:00:00 2001
From 0b90223266a44ecb1cdaa22ec463a24d231cb174 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 9cac2d299..cd6c2f7ca 100644
index 5d42cf62..7164ff2c 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1692,4 +1692,15 @@ public final class Bukkit {
@@ -1704,4 +1704,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -29,10 +29,10 @@ index 9cac2d299..cd6c2f7ca 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8f16fb0cb..60d85e233 100644
index aabf82b5..5313b152 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1487,4 +1487,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1497,4 +1497,13 @@ public interface Server extends PluginMessageRecipient {
*/
boolean isStopping();
// Paper end

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

@@ -1,4 +1,4 @@
From 2631d1fdbeb89f1f261a0ce8480bd2c385d8d5d2 Mon Sep 17 00:00:00 2001
From f95a1f1d184934497e26f6cb76f87e0018ece82d 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 cd6c2f7ca..151de5c86 100644
index 7164ff2c..a5cc0944 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1702,5 +1702,14 @@ public final class Bukkit {
@@ -1714,5 +1714,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -28,10 +28,10 @@ index cd6c2f7ca..151de5c86 100644
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 60d85e233..a013eb2b9 100644
index 5313b152..86ffcf87 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1495,5 +1495,12 @@ public interface Server extends PluginMessageRecipient {
@@ -1505,5 +1505,12 @@ public interface Server extends PluginMessageRecipient {
*/
@NotNull
String getServerName();