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 & Pufferfish)

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

Paper Changes:
PaperMC/Paper@c7d4c01 Ignore invalid jars inside of the updates folder (Fixes #7751)
PaperMC/Paper@4ecc338 WorldCreator#keepSpawnLoaded (#7673)
PaperMC/Paper@873bfa6 Remove World#refreshChunk deprecation (#7684)
PaperMC/Paper@76ed156 Grant temporary immunity from EAR to moving entities (Fixes #7637) (#7644)
PaperMC/Paper@567fce6 Don't apply previous potion when item is potion (fixes #7756) (#7757)
PaperMC/Paper@c449f6a Build updates
PaperMC/Paper@ef6a1a5 Revert to old createProfile(UUID, String) logic (#7723)
PaperMC/Paper@0f8aa4e Fix NPE for BlockDataMeta#getBlockData (#7670)
PaperMC/Paper@16f224a Trigger bee_nest_destroyed trigger in the correct place (#7436)
PaperMC/Paper@caf4a6f Remove or replace a few dumb deprecations (#7760)
PaperMC/Paper@47f43da Add missing javadoc deprecation msgs for PlayerProfile (#7688)
PaperMC/Paper@fbbc03a Add EntityDyeEvent and CollarColorable interface (#7625)
PaperMC/Paper@5b85ee3 Fire CauldronLevelChange on initial fill (#7678)
PaperMC/Paper@4dc78ae Fix some team color docs and added hasColor (#7602)
PaperMC/Paper@0bf7c95 Fix opening inv in PlayerRecipeBookClickEvent handler (#7552)
PaperMC/Paper@d70ac03 fix powder snow cauldrons not turning to water (#7229)
PaperMC/Paper@ce059b4 Fix V1451 dataconverter stat types

Pufferfish Changes:
pufferfish-gg/Pufferfish@52e42d7 Updated Upstream (Paper)
pufferfish-gg/Pufferfish@7b760fe Fix method profiler config
pufferfish-gg/Pufferfish@65a83aa Updated Upstream (Paper)
This commit is contained in:
granny
2022-04-27 02:01:41 -07:00
parent e973e3cbcc
commit 5424457174
25 changed files with 91 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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 02eda647b3edce330251c97483d861a080238e37..3f173ab53030057aed17462c1e6345b8f1780167 100644
index 010f9d3a42dd998c7f7837157ef18699ba445ec1..a5eb36738e6cbb55dc3a28467b062f014395e013 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2344,5 +2344,14 @@ public final class Bukkit {
@@ -2380,5 +2380,14 @@ public final class Bukkit {
public static String getServerName() {
return server.getServerName();
}
@@ -24,10 +24,10 @@ index 02eda647b3edce330251c97483d861a080238e37..3f173ab53030057aed17462c1e6345b8
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ef034c77723ffff8eb70326d4952f8f169cb1932..519067033f702620e9ccda7d3474d3acc3e14876 100644
index 8357f802f60f146cbc08ea7991a3b3a24d8bc233..dbca73bfab240b5d207e9904b69be1481096f874 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2046,5 +2046,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2080,5 +2080,12 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
*/
@NotNull
String getServerName();