Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-28 11:29:11 +00:00
Code Issues Releases Activity

Updated Upstream (Paper/Gale/Purpur)

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

Paper Changes:
PaperMC/Paper@d1a72ea Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11405)
PaperMC/Paper@0a53f1d Set default drop behavior for player deaths (#11380)
PaperMC/Paper@951e7dd Fix TrialSpawner forgetting assigned mob when placed by player (#11381)
PaperMC/Paper@13a2395 Fix enable-player-collisions playing sounds when set to false (#11390)
PaperMC/Paper@1348e44 Prevent NPE when serializing unresolved profile (#11407)

Gale Changes:
Dreeam-qwq/Gale@f346681 Updated Upstream (Paper)
Dreeam-qwq/Gale@bba1737 Updated Upstream (Paper)

Purpur Changes:
PurpurMC/Purpur@88352c3 Updated Upstream (Paper)
PurpurMC/Purpur@dee41bc Updated Upstream (Paper)
PurpurMC/Purpur@fdfc12e Updated Upstream (Paper)
PurpurMC/Purpur@bc7bcbb Fix elytra durability setting not working properly (#1589)
PurpurMC/Purpur@8af4ea6 Updated Upstream (Paper)
PurpurMC/Purpur@8332fa4 Updated Upstream (Paper)
This commit is contained in:
Dreeam
2024-09-17 01:38:58 -04:00
parent 0fd4eb732f
commit 337a94cda9
18 changed files with 124 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/server/0015-Remove-Timings.patch
View File

@@ -1325,7 +1325,7 @@ index b044de2a7af189e4ee4c8d72212fb8b7612f8a3a..20f1069230fcef4a00deec4c0ae6fdc6
}
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
index 5bf0ddcf797e8e1ddaff31841e574089159b6928..a66c3ce90af1a3566bd5055a5dec6280b97d3df8 100644
index f93ef54bbb02d0749a42aeebf8425472804cd213..63678ff4e0948c7c67e092f446e0bfa358695887 100644
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
@@ -1,6 +1,5 @@
@@ -1335,7 +1335,7 @@ index 5bf0ddcf797e8e1ddaff31841e574089159b6928..a66c3ce90af1a3566bd5055a5dec6280
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -1294,7 +1293,6 @@ public abstract class PlayerList {
@@ -1299,7 +1298,6 @@ public abstract class PlayerList {
public void saveAll(int interval) {
io.papermc.paper.util.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
@@ -1343,7 +1343,7 @@ index 5bf0ddcf797e8e1ddaff31841e574089159b6928..a66c3ce90af1a3566bd5055a5dec6280
int numSaved = 0;
long now = MinecraftServer.currentTick;
for (int i = 0; i < this.players.size(); ++i) {
@@ -1305,7 +1303,6 @@ public abstract class PlayerList {
@@ -1310,7 +1308,6 @@ public abstract class PlayerList {
}
// Paper end - Incremental chunk and player saving
}
@@ -1639,7 +1639,7 @@ index 4aa33233060b2b2bd809d92d35bd0933cb015d41..5ad94cabbab741d69363d40df359075d
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 5d7280ad82c03b35ea6636d633ef411c220f9bb6..5bb054398651fedc99c5bb454e638ba3a694b9c8 100644
index 91548197ef6665e271a9104fd2cb8a3a38ea05b1..f29b9be2a7ab617191161e1ff2a16b5a3d3c7b3b 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -478,7 +478,6 @@ public final class CraftServer implements Server {
@@ -1789,7 +1789,7 @@ index b3e1adeb932da9b3bed16acd94e2f16da48a7c72..e9798517b9211c50a20ea5c69603aab3
}
}
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
index 4f65503d9989530bd34734d27d30699df93c24cc..3ecdc98b20888422b5f566e1bfe1c8cef6ea8a54 100644
index d2c34cc068ac7943844ad38ac92d2af774e211fa..3786f6944b0b025c33749c301c2d11b33311a02a 100644
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
@@ -199,9 +199,7 @@ public final class CraftMagicNumbers implements UnsafeValues {