mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 10:27:44 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@aabf676 Prevent unloading worlds with pending player logins
This commit is contained in:
@@ -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 650fec0af19d1d23b680858a1880a92dfb0b8531..c685e0acb2559e7415c94790d8392f0ee997ecc6 100644
|
||||
index e9f4e6aa5a1ad464eaf3e0beebd21fd577d2fe3c..fdc9de253ae6d20b4df71fd6e6c1bb98ec753abf 100644
|
||||
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
||||
@@ -2674,7 +2674,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
||||
@@ -2677,7 +2677,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
|
||||
|
||||
Reference in New Issue
Block a user