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

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@e6ef1ba [ci skip] Update download urls (#9100)
PaperMC/Paper@9367e6e Prevent GameEvents being fired from unloaded chunks
PaperMC/Paper@9b77660 Port airplane's use array for gamerule storage patch (#9087)
This commit is contained in:
Encode42
2023-04-06 15:30:17 -04:00
parent 285f9f683d
commit 4155131661
7 changed files with 984 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0245-Allow-void-trading.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] Allow void trading
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
index 34761f14354ce29db48859ebb142740ea6b53ff9..e0951fd02868f04bb12afab15b73b6d41e814abd 100644
index 88722e911bb342d989c0d750f90bc4224351d0ed..b58c07f454fa0b6911f344899c414983fda4b115 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2682,7 +2682,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2685,7 +2685,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
// Spigot Start
if (entity.getBukkitEntity() instanceof org.bukkit.inventory.InventoryHolder && (!(entity instanceof ServerPlayer) || entity.getRemovalReason() != Entity.RemovalReason.KILLED)) { // SPIGOT-6876: closeInventory clears death message
// Paper start
@@ -18,7 +18,7 @@ index 34761f14354ce29db48859ebb142740ea6b53ff9..e0951fd02868f04bb12afab15b73b6d4
}
// Paper end
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 74583d5034002bc9fb1229fba1f1cf4348828359..0015c6ba0e4d400e309b386246418635a969a751 100644
index 904849c26b8ef5197500a45b371f49411e415100..8ab5e0ec388f18196242c8fa1672a4729019bdbe 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -425,6 +425,7 @@ public class PurpurWorldConfig {