diff --git a/gradle.properties b/gradle.properties index 520f35e..7ac7486 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ apiVersion=1.21.11 release=1 # 0 for skip release, 1 for pre-release, 2 for release -luminolRef=ac1ab569a3af762fc0569bc2842ed5718d94460b +luminolRef=9a6885942fcdd6dd4ba1c6a3ebf4e728232159a7 org.gradle.configuration-cache=true org.gradle.caching=true diff --git a/lophine-server/minecraft-patches/features/0008-Fix-datapack-command-save-function.patch b/lophine-server/minecraft-patches/features/0008-Fix-datapack-command-save-function.patch index 1dd038d..7bc260d 100644 --- a/lophine-server/minecraft-patches/features/0008-Fix-datapack-command-save-function.patch +++ b/lophine-server/minecraft-patches/features/0008-Fix-datapack-command-save-function.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Fix datapack command save function diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index 2f91e80f8c3df2775a793aa3c648c50007543192..6230c08d001aebc119900906aa557247261985a3 100644 +index ad8a0130069ae06f8e9fdd4cceed9b9028c8e727..1124987a47bcdb4c64bcc842f30675f4da866261 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -2430,6 +2430,16 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop 0) { this.playerList.saveAll(playerSaveInterval); @@ -74,7 +74,7 @@ index 951953427b5b18cfc187b0ab04e1f3bbfd0ea6c4..eaf770a1b78e002c0559c0bfdad416e1 } for (final ServerLevel level : (region == null ? this.getAllLevels() : Arrays.asList(region.world))) { // Folia - region threading if (level.paperConfig().chunks.autoSaveInterval.value() > 0) { -@@ -2020,6 +2028,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop= resultLimit) { diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java -index eaf770a1b78e002c0559c0bfdad416e1bf1dda9d..62069db658d188abdacf071f33e93e11f1467300 100644 +index e6c55ee206e7bf35fa2a3d8ce400a13932f249c8..30dccb37822c2267c4759804164cc4871fdb8c61 100644 --- a/net/minecraft/server/MinecraftServer.java +++ b/net/minecraft/server/MinecraftServer.java -@@ -1895,7 +1895,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop { // Folia - region threading // Paper start - Expand PlayerGameModeChangeEvent org.bukkit.event.player.PlayerGameModeChangeEvent event = player.setGameMode(gameMode, org.bukkit.event.player.PlayerGameModeChangeEvent.Cause.DEFAULT_GAMEMODE, null); // Folia - region threading -@@ -2493,7 +2493,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop