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)

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

Paper Changes:
PaperMC/Paper@b89e6a0 Readd more patches
PaperMC/Paper@be8ac7a Fix respawn error due to null location
PaperMC/Paper@8d91b85 Prioritize vanilla commands in function parsing (#11011)
This commit is contained in:
granny
2024-07-04 21:48:11 -07:00
parent 8b987b1110
commit de2e7a7967
37 changed files with 173 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0226-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 3f5460eef103b0c664f52838fb4f7e000c216879..dfb25c24237d98159e3c58b3d800c6ab5dc5e81b 100644
index ebcf9afd13940922f288d651afff32fdbcf36317..744702d92ba01f2fe889d4bd989e8687b558a7a9 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2598,7 +2598,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
@@ -2617,7 +2617,7 @@ public class ServerLevel extends Level implements WorldGenLevel, ca.spottedleaf.
// 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 - Fix merchant inventory not closing on entity removal