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

Implement NSA-Mandated Spyware

Browse Source 
Paper Changes:
PaperMC/Paper@956062a Add transient modifiers (#9244)
PaperMC/Paper@d8e0759 Updated Upstream (Bukkit/CraftBukkit)
PaperMC/Paper@14cfd64 Schedule several things for removal in 1.21 (#9041)
PaperMC/Paper@175a774 [ci skip] Use a separate interface for bootstrapping (#9267)
PaperMC/Paper@bc4a664 Paper Plugins Dependency Format Update (#9160)

Pufferfish Changes:
pufferfish-gg/Pufferfish@cadfa71 Fix config bugs
This commit is contained in:
Ben Kerllenevich
2023-06-07 13:02:26 -04:00
parent f4296d6226
commit ead09e2bf6
25 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
patches/api/0046-Debug-Marker-API.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Debug Marker API
diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
index 72e8e8ff651cf254e0fe3a8927272ea8da0f5f5a..74731f0d64d3bfc61baf816516b2bcef6515213e 100644
index a4ecff25f1e43cc000751e41c73732d1130ded26..a2f617537292e3bac52d665a6e51b7d4ce4a227e 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2498,5 +2498,89 @@ public final class Bukkit {
@@ -2521,5 +2521,89 @@ public final class Bukkit {
public static void removeFuel(@NotNull Material material) {
server.removeFuel(material);
}
@@ -99,10 +99,10 @@ index 72e8e8ff651cf254e0fe3a8927272ea8da0f5f5a..74731f0d64d3bfc61baf816516b2bcef
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index 8b53a9149f655870ebc1c912eeb9fecbcb4836b8..d87e4d177b60957eee198c3f1791dbf26dbdddd6 100644
index 6082415b34fbaa49693e13c9605560f6495549c3..96160bced90bb4cd84e48c85c645cad0eb672b85 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2177,5 +2177,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2204,5 +2204,75 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @param material The material that will no longer be a fuel
*/
public void removeFuel(@NotNull Material material);
@@ -179,10 +179,10 @@ index 8b53a9149f655870ebc1c912eeb9fecbcb4836b8..d87e4d177b60957eee198c3f1791dbf2
// Purpur end
}
diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
index 9b5cd8a33bae463872efecaca0829b7d2b434529..4561ca02052d774bc1424f7044c34f7affd415fc 100644
index d07b6f40c111c9b131f2995e9796d66f5344c5df..adf8169d5baefa7a33c33ef066180a8116617756 100644
--- a/src/main/java/org/bukkit/World.java
+++ b/src/main/java/org/bukkit/World.java
@@ -3981,6 +3981,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
@@ -3982,6 +3982,76 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
* @return The local difficulty
*/
public float getLocalDifficultyAt(@NotNull Location location);