aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
diff options
context:
space:
mode:
authorJake Potrebic <[email protected]>2024-04-12 12:14:06 -0700
committerGitHub <[email protected]>2024-04-12 12:14:06 -0700
commit526795bacd07c019fe3652c96d74cc9f91ecb1fd (patch)
treed1d57ba4f75f239030713ac504df570c25a244b8 /patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
parent37db2d7e4c10510a39b083600befec5dfc7cfbd4 (diff)
downloadPaper-526795bacd07c019fe3652c96d74cc9f91ecb1fd.tar.gz
Paper-526795bacd07c019fe3652c96d74cc9f91ecb1fd.zip
Update patches to handle vineflower decompiler (#10406)
* Update patches to handle vineflower decompiler * update patches again to handle inlined simple lambdas * update vf again and re-apply/rebuild patches * update patches after removal of verify-merges flag * fix compile issue * remove maven local * fix some issues * address more issues * fix collision patch * use paperweight release * more fixes * update fineflower and fix patches again * add missing comment descriptor --------- Co-authored-by: Jason Penilla <[email protected]>
Diffstat (limited to 'patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch')
-rw-r--r--patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch b/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
index 903a710120..060a7d91fb 100644
--- a/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
+++ b/patches/server/0708-Option-to-have-default-CustomSpawners-in-custom-worl.patch
@@ -10,7 +10,7 @@ just looking at the LevelStem key, look at the DimensionType key which
is one level below that. Defaults to off to keep vanilla behavior.
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1c1d111eba7b625bd36b95fbec83d8c5f8272b97..239b1616ddd4cb64a0565d0f8f3bef7bbaaf23c9 100644
+index 186bbc60f6e283aeb00e339c98c034e2268f160d..5b4e4459aa0bcdcf422f4191ebda7b42892d24e4 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -617,7 +617,15 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa