Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-19 01:17:42 +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@08c0b48 [ci skip] update paperweight to 1.5.7 & re-enable filterpatches (#9799)
PaperMC/Paper@29a0209 Properly check water block when random ticking ice (#9804)
This commit is contained in:
granny
2023-10-06 19:37:50 -07:00
parent fd01882d1f
commit be959650a5
8 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0237-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 6f39e4bdafb41c3ea0ed21eb35dcfdf78c0c7ba1..7a1e26d3aa650d24687a1bbf07e9d85c94b85712 100644
index fc5444f5ae0f293266548bb30f9861da9f25d265..158e690713204ad2d0b6ff3d0daa1f13a8100f1e 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2861,7 +2861,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2862,7 +2862,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