Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17: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:
ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851)
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)
This commit is contained in:
William Blake Galbreath
2020-03-10 19:30:18 -05:00
parent a9305232b2
commit f2e328d295
53 changed files with 486 additions and 530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/api/0002-Tuinity-API-Patches.patch
View File

@@ -1,4 +1,4 @@
From ac2da46e3db5951ece720838726cf5b0d8ceb7f2 Mon Sep 17 00:00:00 2001
From 9c22c9759cf1460418eecb1224cc0bec509de0fa Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Fri, 14 Dec 2018 21:52:29 -0800
Subject: [PATCH] Tuinity API Patches
@@ -10,7 +10,7 @@ Subject: [PATCH] Tuinity API Patches
3 files changed, 57 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 58a1f7d07..19d003fa8 100644
index 58a1f7d0..19d003fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,8 +18,8 @@
@@ -36,10 +36,10 @@ index 58a1f7d07..19d003fa8 100644
<!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
<dependency>
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 5047be15f..d9df7509a 100644
index af0637f7..a3ed3154 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3067,6 +3067,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3165,6 +3165,34 @@ public interface World extends PluginMessageRecipient, Metadatable {
int getViewDistance();
// Spigot end
@@ -75,7 +75,7 @@ index 5047be15f..d9df7509a 100644
public class Spigot {
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
index 877ea4f32..5367975ac 100644
index 877ea4f3..5367975a 100644
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
@@ -1969,6 +1969,29 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM

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

@@ -1,4 +1,4 @@
From 3c223fc899501579d3656f7e73da79b195c59f39 Mon Sep 17 00:00:00 2001
From 713489b865ff4aa3f8597b6415fe0b345156c504 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, 38 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..b5111928d 100644
index 93d5a3f9..b5111928 100644
--- a/src/main/java/co/aikar/timings/TimingsExport.java
+++ b/src/main/java/co/aikar/timings/TimingsExport.java
@@ -204,9 +204,14 @@ class TimingsExport extends Thread {
@@ -51,10 +51,10 @@ index 93d5a3f97..b5111928d 100644
JSONObject object = new JSONObject();
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 98e7ba900..bea600c65 100644
index 80f9abdc..739182ef 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1331,6 +1331,23 @@ public interface Server extends PluginMessageRecipient {
@@ -1371,6 +1371,23 @@ public interface Server extends PluginMessageRecipient {
}
// Paper end

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

@@ -1,4 +1,4 @@
From 88169f864dd54bc7ee722705785554377e745594 Mon Sep 17 00:00:00 2001
From 05c1703c9edc678587fbb6a84e91edca73ec9747 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 355bd2e22..50415189c 100644
index b9973406..3a60094a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -807,13 +807,10 @@ public final class Bukkit {
@@ -851,13 +851,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 355bd2e22..50415189c 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 765f8059a..e0d207d73 100644
index 739182ef..0f7e84fb 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -672,13 +672,10 @@ public interface Server extends PluginMessageRecipient {
@@ -712,13 +712,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 765f8059a..e0d207d73 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/0010-Add-tick-times-API.patch
View File

@@ -1,4 +1,4 @@
From 7237c98d2466a3bbbf909eced8c728aa5242fdcf Mon Sep 17 00:00:00 2001
From 56c9dfec5e48c93e44bf73e8d841c851202320c2 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, 38 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 50415189c..8fbda2aee 100644
index 3a60094a..6935cf27 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1620,4 +1620,25 @@ public final class Bukkit {
@@ -1664,4 +1664,25 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -39,10 +39,10 @@ index 50415189c..8fbda2aee 100644
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 0c45c9af3..75bf097ed 100644
index 0f7e84fb..df1765b5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1430,4 +1430,21 @@ public interface Server extends PluginMessageRecipient {
@@ -1470,4 +1470,21 @@ public interface Server extends PluginMessageRecipient {
*/
int getCurrentTick();
// Paper end

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

@@ -1,4 +1,4 @@
From ab2f131fdd232bd09bedb76172d48ca5f6458435 Mon Sep 17 00:00:00 2001
From 33ce16852b951902d8a9685c5a65837796e94ebf 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, 16 insertions(+)
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 8fbda2aee..a2cf8e29b 100644
index 6935cf27..abf7caf0 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1622,6 +1622,15 @@ public final class Bukkit {
@@ -1666,6 +1666,15 @@ public final class Bukkit {
}
// Purpur start
@@ -29,10 +29,10 @@ index 8fbda2aee..a2cf8e29b 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 75bf097ed..89100f3f5 100644
index df1765b5..39d933aa 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1432,6 +1432,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1472,6 +1472,13 @@ public interface Server extends PluginMessageRecipient {
// Paper end
// Purpur start

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

@@ -1,4 +1,4 @@
From e87e36de2b313502386d54bcae4f7c531f1c183b Mon Sep 17 00:00:00 2001
From 2ca955541330acf8eef7244843b91694407e881b 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 a2cf8e29b..220cc96c0 100644
index abf7caf0..c9fc59a2 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -1631,6 +1631,15 @@ public final class Bukkit {
@@ -1675,6 +1675,15 @@ public final class Bukkit {
return server.getServerName();
}
@@ -29,10 +29,10 @@ index a2cf8e29b..220cc96c0 100644
* Get a sample of the servers last tick times (in nanos)
*
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 89100f3f5..ee0f2d6b2 100644
index 39d933aa..eba6a7a7 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1439,6 +1439,13 @@ public interface Server extends PluginMessageRecipient {
@@ -1479,6 +1479,13 @@ public interface Server extends PluginMessageRecipient {
@NotNull
String getServerName();

8
patches/api/0021-Add-moon-phase-API.patch
View File

@@ -1,4 +1,4 @@
From 21773eb994120e80f72be1ed9d0a51523149b022 Mon Sep 17 00:00:00 2001
From 0a5979ad09792249e6c4b56860bbcf45cb5b9634 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <Blake.Galbreath@GMail.com>
Date: Sat, 1 Feb 2020 22:22:07 -0600
Subject: [PATCH] Add moon phase API
@@ -11,7 +11,7 @@ Subject: [PATCH] Add moon phase API
diff --git a/src/main/java/net/pl3x/purpur/MoonPhase.java b/src/main/java/net/pl3x/purpur/MoonPhase.java
new file mode 100644
index 000000000..f5ad98c62
index 00000000..f5ad98c6
--- /dev/null
+++ b/src/main/java/net/pl3x/purpur/MoonPhase.java
@@ -0,0 +1,36 @@
@@ -52,10 +52,10 @@ index 000000000..f5ad98c62
+ }
+}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d9df7509a..d8178abfc 100644
index a3ed3154..01d7204b 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3145,6 +3145,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3243,6 +3243,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@NotNull
public List<Raid> getRaids();

6
patches/api/0026-Add-getPlacementBlockData-to-World.patch
View File

@@ -1,4 +1,4 @@
From c5c975aca49194cc02c4af567d9b73a8edcc6f22 Mon Sep 17 00:00:00 2001
From 0080a35f149be736b9d274e7272d24842da4e985 Mon Sep 17 00:00:00 2001
From: William Blake Galbreath <blake.galbreath@gmail.com>
Date: Sat, 19 Oct 2019 00:34:36 -0500
Subject: [PATCH] Add getPlacementBlockData to World
@@ -8,10 +8,10 @@ Subject: [PATCH] Add getPlacementBlockData to World
1 file changed, 10 insertions(+)
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index d8178abfc..b17a03334 100644
index 01d7204b..be430fb0 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3153,6 +3153,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -3251,6 +3251,16 @@ public interface World extends PluginMessageRecipient, Metadatable {
*/
@NotNull
net.pl3x.purpur.MoonPhase getMoonPhase();