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

Updated Upstream (Paper & Pufferfish)

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

Paper Changes:
PaperMC/Paper@2ec04e0 Use correct headerLocation for regionfile initialisation
PaperMC/Paper@f23c039 Fix infinite recursion in spawnCategoryForChunk/Position
PaperMC/Paper@9940bca API for creating command sender which forwards feedback (#7432)

Pufferfish Changes:
pufferfish-gg/Pufferfish@d549dda Improve vanilla parity of suffocation patch
pufferfish-gg/Pufferfish@17b3430 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@bcbaf3e Fix div by zero
This commit is contained in:
BillyGalbreath
2022-02-02 21:10:07 -06:00
parent 3f1ad9380d
commit d89923f642
13 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/api/0004-Purpur-config-files.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Purpur config files
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index e48af3822e9f118399c3a1c9358c56efae12e0da..090ea732a000f7f668abe303437245b99fc9e4c6 100644
index 73446141e8c50b71a17ff6f0c528a62d5c75751b..85b6174f9ede8929e6931a125de03922755997f5 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1778,6 +1778,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1790,6 +1790,18 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
}
// Paper end

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

@@ -5,10 +5,10 @@ Subject: [PATCH] Bring back server name
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 53c4e5ca208ee17c7c244e416c537c7b63edf194..fdebfab6bdb74756c1bee4b7f03a27c2056388c9 100644
index 3a8326735b62521f8fb95c51a0909d8b7bac83d1..5d76861b8745c7b5d7a67391c110ca12c0533966 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2181,4 +2181,15 @@ public final class Bukkit {
@@ -2195,4 +2195,15 @@ public final class Bukkit {
public static Server.Spigot spigot() {
return server.spigot();
}
@@ -25,10 +25,10 @@ index 53c4e5ca208ee17c7c244e416c537c7b63edf194..fdebfab6bdb74756c1bee4b7f03a27c2
+ // Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 090ea732a000f7f668abe303437245b99fc9e4c6..3773a4e1c6bdc020b7dbfb967192d17ad08c3813 100644
index 85b6174f9ede8929e6931a125de03922755997f5..eaabd077d1a819cf074fbae40bccc9364b1a49d3 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1900,4 +1900,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1912,4 +1912,13 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@NotNull
io.papermc.paper.datapack.DatapackManager getDatapackManager();
// Paper end

8
patches/api/0014-Lagging-threshold.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Lagging threshold
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index fdebfab6bdb74756c1bee4b7f03a27c2056388c9..7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f 100644
index 5d76861b8745c7b5d7a67391c110ca12c0533966..1c24ef085669d7d0cc8d67b661e900b172f4b99a 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2191,5 +2191,14 @@ public final class Bukkit {
@@ -2205,5 +2205,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index fdebfab6bdb74756c1bee4b7f03a27c2056388c9..7d9d0bb3001fd6f0fd0f1c7ddca5964e
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 3773a4e1c6bdc020b7dbfb967192d17ad08c3813..fa2a5c8ed947cd2beed01df82fcc5e450e3e5782 100644
index eaabd077d1a819cf074fbae40bccc9364b1a49d3..fc5b0ebb0d71dc4728b95297a50ac61e2f2d58bf 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1908,5 +1908,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1920,5 +1920,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();

4
patches/api/0029-Fix-javadoc-warnings-missing-param-and-return.patch
View File

@@ -489,10 +489,10 @@ index 3afd5f5c0208a4ee93b5dbfc2aab2b9d2e8a7544..7838731e0e16bdccfb79e74ceb64148f
/**
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index fa2a5c8ed947cd2beed01df82fcc5e450e3e5782..d5e7538f7c7f288e1710fb383b57683f08ee0e57 100644
index fc5b0ebb0d71dc4728b95297a50ac61e2f2d58bf..6e4ef6de10442f73ca7bd1c48496d920c3ef3899 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1751,6 +1751,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1763,6 +1763,9 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
UnsafeValues getUnsafe();
// Spigot start

24
patches/api/0033-Conflict-on-change-for-adventure-deprecations.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Conflict on change for adventure deprecations
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102b92be020 100644
index 1c24ef085669d7d0cc8d67b661e900b172f4b99a..a046ba83697ef7e3b9dd0034920a84912e0f5f0b 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -413,7 +413,7 @@ public final class Bukkit {
@@ -26,7 +26,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
public static int broadcast(@NotNull String message, @NotNull String permission) {
return server.broadcast(message, permission);
}
@@ -1421,7 +1421,7 @@ public final class Bukkit {
@@ -1435,7 +1435,7 @@ public final class Bukkit {
*
* @see InventoryType#isCreatable()
*/
@@ -35,7 +35,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title) {
return server.createInventory(owner, type, title);
@@ -1471,7 +1471,7 @@ public final class Bukkit {
@@ -1485,7 +1485,7 @@ public final class Bukkit {
* @throws IllegalArgumentException if the size is not a multiple of 9
* @deprecated in favour of {@link #createInventory(InventoryHolder, InventoryType, net.kyori.adventure.text.Component)}
*/
@@ -44,7 +44,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
@NotNull
public static Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException {
return server.createInventory(owner, size, title);
@@ -1498,7 +1498,7 @@ public final class Bukkit {
@@ -1512,7 +1512,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -53,7 +53,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
public static Merchant createMerchant(@Nullable String title) {
return server.createMerchant(title);
}
@@ -1596,7 +1596,7 @@ public final class Bukkit {
@@ -1610,7 +1610,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -62,7 +62,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
public static String getMotd() {
return server.getMotd();
}
@@ -1618,7 +1618,7 @@ public final class Bukkit {
@@ -1632,7 +1632,7 @@ public final class Bukkit {
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable
@@ -72,7 +72,7 @@ index 7d9d0bb3001fd6f0fd0f1c7ddca5964e1fe8447f..4234d01ed793390ec3fb5fb69cf26102
return server.getShutdownMessage();
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd6bf0a290 100644
index 6e4ef6de10442f73ca7bd1c48496d920c3ef3899..3d9cbd6b37ee932f0b9908e4410107f5a123a551 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -325,7 +325,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -93,7 +93,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
public int broadcast(@NotNull String message, @NotNull String permission);
// Paper start
/**
@@ -1190,7 +1190,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1202,7 +1202,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*
* @see InventoryType#isCreatable()
*/
@@ -102,7 +102,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, @NotNull InventoryType type, @NotNull String title);
@@ -1234,7 +1234,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1246,7 +1246,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @throws IllegalArgumentException if the size is not a multiple of 9
* @deprecated in favour of {@link #createInventory(InventoryHolder, int, net.kyori.adventure.text.Component)}
*/
@@ -111,7 +111,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
@NotNull
Inventory createInventory(@Nullable InventoryHolder owner, int size, @NotNull String title) throws IllegalArgumentException;
@@ -1257,7 +1257,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1269,7 +1269,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #createMerchant(net.kyori.adventure.text.Component)}
*/
@NotNull
@@ -120,7 +120,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
Merchant createMerchant(@Nullable String title);
/**
@@ -1337,7 +1337,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1349,7 +1349,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #motd()}
*/
@NotNull
@@ -129,7 +129,7 @@ index d5e7538f7c7f288e1710fb383b57683f08ee0e57..fee029f0a4b5cbd2b5ab9315a53c03bd
String getMotd();
// Paper start
@@ -1355,7 +1355,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1367,7 +1367,7 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @deprecated in favour of {@link #shutdownMessage()}
*/
@Nullable

8
patches/api/0043-Added-the-ability-to-add-combustible-items.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Added the ability to add combustible items
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 4234d01ed793390ec3fb5fb69cf26102b92be020..91c1d04b77929438bb5c79d8829e14b161b4f2d9 100644
index a046ba83697ef7e3b9dd0034920a84912e0f5f0b..c6d9a42f02cb538ee3739cd01f0a22203c9ceb41 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2200,5 +2200,24 @@ public final class Bukkit {
@@ -2214,5 +2214,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 4234d01ed793390ec3fb5fb69cf26102b92be020..91c1d04b77929438bb5c79d8829e14b1
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index fee029f0a4b5cbd2b5ab9315a53c03bd6bf0a290..2c4dfcf909c0214d25232a14635b96f92d4d974a 100644
index 3d9cbd6b37ee932f0b9908e4410107f5a123a551..1a38b9e616c6096d8d64c8abaa7178bc5f84e8d4 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -1918,5 +1918,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -1930,5 +1930,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();