Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-22 08:19:26 +00:00
Code Issues Releases Activity

Updated Upstream (Paper)

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

Paper Changes:
PaperMC/Paper@5a362b8 Use ConcurrentUtil from Paper repo
PaperMC/Paper@ef0670c Update paperweight and Gradle wrapper
PaperMC/Paper@e5bf173 Always fork jvm for compile, even when using the Gradle runtime jvm
PaperMC/Paper@cbd578c Fix api build script deprecation
PaperMC/Paper@7e601ad Implement new CustomModelData
PaperMC/Paper@3b35456 Implement assetid
PaperMC/Paper@d0645d9 Update readme, set updatingMinecraft to false
PaperMC/Paper@747cac4 Updated Upstream (CraftBukkit)
PaperMC/Paper@416a733 Apply coordinate offset only to VoxelShape
PaperMC/Paper@1cc86be Update setup-gradle action
PaperMC/Paper@b0d7153 fix item meta
PaperMC/Paper@2206b9a fix components
PaperMC/Paper@e73d396 fix asset id
PaperMC/Paper@2a4ba00 add missing effect cause, for bee being poisoned
PaperMC/Paper@4806ce5 properly override push/knockback methods
PaperMC/Paper@bb4fb53 call EntityInsideBlockEvent for eyeblossom
PaperMC/Paper@ae060b3 Finish PlayerPickItemEvent
PaperMC/Paper@c54c062 Port exact choice improvements (#11705)
PaperMC/Paper@e4e24f3 Move around patches again
PaperMC/Paper@4c39ea2 More moving around of hunks
PaperMC/Paper@77afb9a Add new bundle animation (#11708)
PaperMC/Paper@346b9b8 Fixup PlayerPickItemEvent docs more
This commit is contained in:
Samsuik
2024-12-05 21:55:07 +00:00
parent 3345cc305d
commit 7f8d0d086d
10 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
patches/server/0004-Local-Config-and-Value-Storage-API.patch
View File

@@ -213,7 +213,7 @@ index 0000000000000000000000000000000000000000..b445166f38202ec250bcaf124b88746b
+ }
+}
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 686322e99b33fd3334302d3ccafd881b609b6d96..0bdefa7ad46887fe3eb9045b63195541d3b792e1 100644
index a39b00ebb37a0bf041bc7b9861fb7f9ebd962c40..1f9f023a43c16cc472deea5285b01c19136e019f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1890,6 +1890,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -242,10 +242,10 @@ index 34e7ae8b36e375280f9515c1580c55c0832fc194..13e8ac95daa115720a2b1f52ad33d124
public final com.destroystokyo.paper.antixray.ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
public static BlockPos lastPhysicsProblem; // Spigot
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a9f7ac8d1f5e184687d53ab3e8b348bb7f4f2ba0..7272e15eef99cee8c038219d3b5b49e33f9e432f 100644
index 92d9f0ea8f7810ae20d3996f49aefa539b4bcb69..8fc4b65887351a4dc35eaa837dea4dc9513514a8 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -288,6 +288,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
@@ -289,6 +289,13 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
// Paper end