9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-31 04:46:38 +00:00

Updated Upstream (Paper/Gale)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dd11ef8 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#11102)
PaperMC/Paper@3c8a7fe Re-add missing chunk event calls (#11104)
PaperMC/Paper@a8db527 Even more cleanup of mcutil patch
PaperMC/Paper@d08e8d1 Add total time to done message (#11109)
PaperMC/Paper@2a39276 Add CrafterCraftEvent (#11082)
PaperMC/Paper@75af62b Split rewriting flag into `paper.disableOldApiSupport` and `paper.disablePluginRemapping` (#11108)
PaperMC/Paper@7ea4039 Fixup startup time log message
PaperMC/Paper@e71c1df Call PlayerChunkUnloadEvent
PaperMC/Paper@968bdeb Make CraftComplexRecipe extend CraftingRecipe (#11114)
PaperMC/Paper@f1f01a1 Adjust done message again (#11118)

Gale Changes:
Dreeam-qwq/Gale@0096a24 Update Add xor-shift random
Dreeam-qwq/Gale@4ce6439 Updated Upstream (Paper)
Dreeam-qwq/Gale@d4f0ad7 Updated Upstream (Paper)
This commit is contained in:
Dreeam
2024-07-20 08:05:38 +08:00
parent 8aa8b7d26c
commit 41c0ee47fc
19 changed files with 137 additions and 149 deletions

View File

@@ -51,7 +51,7 @@ 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 aa40039353b9b825370fb01d1da31c157590b046..59983594f1128b82230d8e8572438f2be8002966 100644
index c4c8111bd85e6a8acbffea093d209710cb63b2f8..c5fa13527dc1729f7cbb15067b4edf449c2f6fb1 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1802,6 +1802,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -88,7 +88,7 @@ index b66fdb789fcb460d63fd81540112d655c9a0c3f2..ae0d0310d50f1ada082e045a58a24a43
} 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 442b5ccc446d0dfc69f2d2e88003a77647af78f6..d9652ab4f1090193b20d3218dd5dce165394a37c 100644
index b309541c4a29015ad51e05bb341462bcf247f1eb..3f127b7ca317c14ffeb1d8c3440848ad06efd5c8 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 {
@@ -109,7 +109,7 @@ index 442b5ccc446d0dfc69f2d2e88003a77647af78f6..d9652ab4f1090193b20d3218dd5dce16
org.purpurmc.purpur.task.BossBarTask.removeFromAll(entityplayer.getBukkitEntity()); // Purpur
ServerLevel worldserver = entityplayer.serverLevel();
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
index 6cd292c92486a807ab651f784171793d763e43d4..24d40d615fd1c88aae826709317fee59c93a2a77 100644
index 5d10f4f9e36c0ef448110788ff54df70256c065c..9f0dc22197fbed1baa11fe372566be7e0f875d63 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -491,6 +491,7 @@ public final class CraftServer implements Server {
@@ -120,7 +120,7 @@ index 6cd292c92486a807ab651f784171793d763e43d4..24d40d615fd1c88aae826709317fee59
}
public boolean getCommandBlockOverride(String command) {
@@ -1111,6 +1112,7 @@ public final class CraftServer implements Server {
@@ -1120,6 +1121,7 @@ public final class CraftServer implements Server {
org.purpurmc.purpur.PurpurConfig.registerCommands(); // Purpur
this.overrideAllCommandBlockCommands = this.commandsConfiguration.getStringList("command-block-overrides").contains("*");
this.ignoreVanillaPermissions = this.commandsConfiguration.getBoolean("ignore-vanilla-permissions");