9
0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-25 01:49:16 +00:00

Updated Upstream (Paper/Purpur/Leaves)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@a5f2f614 Fix offhand item desync on cancelling interact events (#12828)
PaperMC/Paper@10318775 [ci/skip] Update mache for codebook 1.0.15 (#12887)

Purpur Changes:
PurpurMC/Purpur@c4e5604c Updated Upstream (Paper)
PurpurMC/Purpur@c130b18e Updated Upstream (Paper)
PurpurMC/Purpur@60bdf1c7 Final Paper Upstream
PurpurMC/Purpur@a39c4cb0 Updated Upstream (Paper)
PurpurMC/Purpur@ea7b18ab Updated Upstream (Paper)
PurpurMC/Purpur@0f82c210 Updated Upstream (Paper)
PurpurMC/Purpur@8de15d66 this is important for the build to not fail..
PurpurMC/Purpur@5053eb0c use a different method for dropping lapis, closes #1692

Leaves Changes:
LeavesMC/Leaves@df8397c7 Fix bot invulnerable
LeavesMC/Leaves@e1c21d3f Movable Budding Amethyst bind carpet rule (#561)
LeavesMC/Leaves@550dba49 Configurable item damage check and good shear behavior (#559)
LeavesMC/Leaves@cb64df44 Old Throwable Projectile tick order (#520)
LeavesMC/Leaves@b5793e80 Fix bot infinity desync (#584)
LeavesMC/Leaves@c5ecbe85 1.21.7/8 (#587)
LeavesMC/Leaves@5497dfb4 Fix CI
LeavesMC/Leaves@2f8255bd Fix LitematicaEasyPlaceProtocol
LeavesMC/Leaves@a416f476 Fix bot use actions (#606) (#605)
LeavesMC/Leaves@bfde470a fix: revert Configurable-collision-behavior patch (#607)
LeavesMC/Leaves@aaa2323d Fix Syncmatica file name
This commit is contained in:
Dreeam
2025-07-24 20:18:23 +08:00
parent e3edba1bdc
commit 3b9d8feb03
62 changed files with 518 additions and 277 deletions

View File

@@ -6,7 +6,7 @@ Subject: [PATCH] Purpur API Changes
Original license: MIT
Original project: https://github.com/PurpurMC/Purpur
Commit: 11c030a8f81b2f845a9f2749790692c2d152f284
Commit: 5053eb0c5dc9662ffb39ae7c39c6ca08c013d898
Patches listed below are removed in this patch, They exists in Gale or Leaf:
* "co/aikar/timings/TimedEventExecutor.java.patch"

View File

@@ -20,7 +20,7 @@ index f04f42832a098836bf41e98787c2db35d154c892..b7782de2fb8e636e82a6ef89a62edeec
// Purpur end - Debug Marker API
+
+ // Leaves start - Photographer API
+ public static @NotNull org.leavesmc.leaves.entity.PhotographerManager getPhotographerManager() {
+ public static @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager() {
+ return server.getPhotographerManager();
+ }
+ // Leaves end - Photographer API
@@ -35,6 +35,6 @@ index cc12db46d30c2499dea87f953ef6bf1fa18900c9..0d8463905bc15382c284fc31a1be6fbb
// Purpur end - Debug Marker API
+
+ // Leaves start - Photographer API
+ @NotNull org.leavesmc.leaves.entity.PhotographerManager getPhotographerManager();
+ @NotNull org.leavesmc.leaves.entity.photographer.PhotographerManager getPhotographerManager();
+ // Leaves end - Photographer API
}

View File

@@ -1,4 +1,4 @@
package org.leavesmc.leaves.entity;
package org.leavesmc.leaves.entity.photographer;
import org.bukkit.entity.Player;
import org.jetbrains.annotations.NotNull;

View File

@@ -1,4 +1,4 @@
package org.leavesmc.leaves.entity;
package org.leavesmc.leaves.entity.photographer;
import org.bukkit.Location;
import org.jetbrains.annotations.NotNull;