Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-21 10:27:44 +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@cfe3ad1 Updated Upstream (Bukkit/CraftBukkit/Spigot)
PaperMC/Paper@02b5ec4 fix 2 more migration issues
This commit is contained in:
William Blake Galbreath
2022-06-09 23:54:39 -05:00
parent 17ea327e08
commit a214265592
13 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/server/0253-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 974b7bb2cd2f8186a6d1bf73e48fdd52f4e0348d..3586ca6e42ca710a56046ca067d9d6423945d8b0 100644
index f6416542dc491c8852a86e76c9300419ff6a0106..063ccc22bb1b249ec93442784ac4ecf7d156a271 100644
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
@@ -2663,7 +2663,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -2666,7 +2666,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