9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2026-01-04 15:41:40 +00:00

Updated Upstream (Purpur)

Upstream has released updates that appear to apply and compile correctly

Purpur Changes:
PurpurMC/Purpur@be61a07 Updated Upstream (Paper)
PurpurMC/Purpur@f154903 Updated Upstream (Paper)
PurpurMC/Purpur@0fa9a50 Updated Upstream (Paper)
PurpurMC/Purpur@d7a7c91 Updated Upstream (Paper)
PurpurMC/Purpur@20fa61e Updated Upstream (Paper)
PurpurMC/Purpur@501e7c5 Updated Upstream (Paper)
PurpurMC/Purpur@2a50638 Updated Upstream (Paper)
PurpurMC/Purpur@639bcbd Updated Upstream (Paper)
PurpurMC/Purpur@bcf8103 remove obsolete allowUnsafeEnchants config option
PurpurMC/Purpur@51f15ee fully remove obsolete allowUnsafeEnchants config option
PurpurMC/Purpur@3d0716d Fix colored shulker box contents not dropping when destroyed, supercedes #1594
PurpurMC/Purpur@12e2926 [ci skip] drop old migration patch
PurpurMC/Purpur@212c942 delegate itemstack convenience methods
PurpurMC/Purpur@2eaea6a switch to JSpecify annotations
This commit is contained in:
Dreeam
2024-10-05 12:25:41 -04:00
parent f15d5c5cef
commit 387edb77c1
17 changed files with 847 additions and 568 deletions

View File

@@ -49,10 +49,10 @@ index 1967c43ee3a12e63365cc40ee6565307e2fd73cf..6e376d0db5321d8e9b6e0b54617ffd17
assert isValidPath(path);
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index d6f9926ce0b6239821144a8886860c95678b9616..04c1dc92d6404fffffd519f9f48763253737f14d 100644
index 59797b01bf0f8dd38b0b57179a7bec0e39f17d6f..7adc85c53991f7b144c44b77431d83ea9edfbbed 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1807,6 +1807,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1816,6 +1816,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
GameTestTicker.SINGLETON.tick();
}
@@ -86,7 +86,7 @@ index 51c8d265f6c40b872efd7e03dccd162a52edff09..648a342c309c12dedf7d70b88163f80f
} catch (Exception ex) {
ServerGamePacketListenerImpl.LOGGER.error("Couldn\'t register custom payload", ex);
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 272c5a875d1a4d6c6c7a100fea8abbb26776b68f..73b69eb3b986cad3fee4bbf381833a363600ec64 100644
index 6923684e361fa4e5e414a1b78192dcdd05377d36..70bdd37ba326fc2a74dc273784fd11261e180372 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -363,6 +363,8 @@ public abstract class PlayerList {