Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-22 10:57: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/0042-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 47c455b7ce0a08d9cd1732a326f7bdce20defe7c..689b16c3c582da7d35746b1d799426c0ecf593b7 100644
index 791a6f13f7048e2c42f945f752f88fddd6825078..171eb247b083e2d665bfee0a2f7ed9e29f728abb 100644
--- a/src/main/java/org/bukkit/Bukkit.java
+++ b/src/main/java/org/bukkit/Bukkit.java
@@ -2353,5 +2353,24 @@ public final class Bukkit {
@@ -2389,5 +2389,24 @@ public final class Bukkit {
public static boolean isLagging() {
return server.isLagging();
}
@@ -34,10 +34,10 @@ index 47c455b7ce0a08d9cd1732a326f7bdce20defe7c..689b16c3c582da7d35746b1d799426c0
// Purpur end
}
diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
index ca1295dfbd1ca547ebf2a0315a45914f0cf51396..4e26a6d95c1d8468c0b9cea8d49fafdc4f64d4f9 100644
index 9f602f664cc468012a86971b6cbab9549771e723..e15b869241113633ed0ded1d49c805ef7b40460c 100644
--- a/src/main/java/org/bukkit/Server.java
+++ b/src/main/java/org/bukkit/Server.java
@@ -2053,5 +2053,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
@@ -2087,5 +2087,20 @@ public interface Server extends PluginMessageRecipient, net.kyori.adventure.audi
* @return True if lagging
*/
boolean isLagging();