diff --git a/patches/server/0016-EventManager.patch b/patches/server/0016-EventManager.patch new file mode 100644 index 0000000..7fbf56c --- /dev/null +++ b/patches/server/0016-EventManager.patch @@ -0,0 +1,39 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 404Setup <153366651+404Setup@users.noreply.github.com> +Date: Sun, 8 Sep 2024 21:38:31 +0800 +Subject: [PATCH] EventManager + + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 4d9438c2c351058eba536fc05d84f1751226754c..8368aeaf37fe5b89e92fcde429a5ed778aab9af6 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -1145,6 +1145,7 @@ public final class CraftServer implements Server { + this.enablePlugins(PluginLoadOrder.STARTUP); + this.enablePlugins(PluginLoadOrder.POSTWORLD); + if (io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper != null) io.papermc.paper.plugin.PluginInitializerManager.instance().pluginRemapper.pluginsEnabled(); // Paper - Remap plugins ++ one.tranic.vine.event.EventManager.INSTANCE.register(); // Vine + // Paper start - brigadier command API + io.papermc.paper.command.brigadier.PaperCommands.INSTANCE.setValid(); // to clear invalid state for event fire below + io.papermc.paper.plugin.lifecycle.event.LifecycleEventRunner.INSTANCE.callReloadableRegistrarEvent(io.papermc.paper.plugin.lifecycle.event.types.LifecycleEvents.COMMANDS, io.papermc.paper.command.brigadier.PaperCommands.INSTANCE, org.bukkit.plugin.Plugin.class, io.papermc.paper.plugin.lifecycle.event.registrar.ReloadableRegistrarEvent.Cause.RELOAD); // call commands event for regular plugins +diff --git a/src/main/kotlin/one/tranic/vine/event/EventManager.kt b/src/main/kotlin/one/tranic/vine/event/EventManager.kt +new file mode 100644 +index 0000000000000000000000000000000000000000..30072eb1bf44aafd95ea7397916aa6dfe0c96d76 +--- /dev/null ++++ b/src/main/kotlin/one/tranic/vine/event/EventManager.kt +@@ -0,0 +1,14 @@ ++package one.tranic.vine.event ++ ++import one.tranic.vine.util.Reflect ++import org.bukkit.Bukkit ++import org.bukkit.craftbukkit.scheduler.MinecraftInternalPlugin ++import org.bukkit.event.Listener ++ ++object EventManager { ++ fun register() { ++ Reflect.findAllClass("one.tranic.event.module").forEach { ++ Bukkit.getPluginManager().registerEvents(it, MinecraftInternalPlugin()) ++ } ++ } ++} +\ No newline at end of file diff --git a/patches/server/0017-PermissionManager.patch b/patches/server/0017-PermissionManager.patch new file mode 100644 index 0000000..e57ceb9 --- /dev/null +++ b/patches/server/0017-PermissionManager.patch @@ -0,0 +1,79 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: 404Setup <153366651+404Setup@users.noreply.github.com> +Date: Sun, 8 Sep 2024 22:12:01 +0800 +Subject: [PATCH] PermissionManager + + +diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +index 8368aeaf37fe5b89e92fcde429a5ed778aab9af6..0aa23076acd87ae5d9b5c079831ce2619c1acb6f 100644 +--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java ++++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java +@@ -611,6 +611,7 @@ public final class CraftServer implements Server { + DefaultPermissions.registerCorePermissions(); + CraftDefaultPermissions.registerCorePermissions(); + ShreddedPaperPermissions.registerCorePermissions(); // ShreddedPaper ++ one.tranic.vine.permission.PermissionManager.INSTANCE.registerCorePermissions(); // Vine + if (!io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) this.loadCustomPermissions(); // Paper + this.helpMap.initializeCommands(); + this.syncCommands(); +@@ -3278,6 +3279,8 @@ public final class CraftServer implements Server { + if (!io.papermc.paper.configuration.GlobalConfiguration.get().misc.loadPermissionsYmlBeforePlugins) loadCustomPermissions(); + DefaultPermissions.registerCorePermissions(); + CraftDefaultPermissions.registerCorePermissions(); ++ ShreddedPaperPermissions.registerCorePermissions(); // Vine - ShreddedPaper ++ one.tranic.vine.permission.PermissionManager.INSTANCE.registerCorePermissions(); // Vine + } + + @Override +diff --git a/src/main/kotlin/one/tranic/vine/permission/PermissionManager.kt b/src/main/kotlin/one/tranic/vine/permission/PermissionManager.kt +new file mode 100644 +index 0000000000000000000000000000000000000000..c714ed520954fd4f16b3a57dfd43946ecabd8ea4 +--- /dev/null ++++ b/src/main/kotlin/one/tranic/vine/permission/PermissionManager.kt +@@ -0,0 +1,45 @@ ++package one.tranic.vine.permission ++ ++import org.bukkit.permissions.Permission ++import org.bukkit.permissions.PermissionDefault ++import org.bukkit.util.permissions.DefaultPermissions ++ ++object PermissionManager { ++ const val ROOT: String = "vine." ++ ++ fun registerCorePermissions() { ++ val parent = DefaultPermissions.registerPermission( ++ ROOT, ++ "Gives the user the ability to use all Vine utilities and commands" ++ ) ++ syncPermissions(parent) ++ parent.recalculatePermissibles() ++ } ++ ++ private fun syncPermissions(parent: Permission) { ++ val commands = DefaultPermissions.registerPermission( ++ "vine", ++ "Gives the user the ability to use all Vine commands", ++ parent ++ ) ++ ++ setPermission( ++ "commands.cfg", ++ "Vine Config Command", ++ PermissionDefault.OP, ++ commands ++ ) ++ setPermission( ++ "commands.threads", ++ "Vine Threads Command", ++ PermissionDefault.OP, ++ commands ++ ) ++ ++ commands.recalculatePermissibles() ++ } ++ ++ private fun setPermission(permission: String, desc: String, def: PermissionDefault, parent: Permission) { ++ DefaultPermissions.registerPermission(ROOT + permission, desc, def, parent) ++ } ++} +\ No newline at end of file diff --git a/patches/server/0016-ThreadInfoCommand.patch b/patches/server/0018-ThreadInfoCommand.patch similarity index 100% rename from patches/server/0016-ThreadInfoCommand.patch rename to patches/server/0018-ThreadInfoCommand.patch diff --git a/patches/server/0017-Nbt-Utils.patch b/patches/server/0019-Nbt-Utils.patch similarity index 100% rename from patches/server/0017-Nbt-Utils.patch rename to patches/server/0019-Nbt-Utils.patch diff --git a/patches/server/0018-Virtual-threads-1.0.patch b/patches/server/0020-Virtual-threads-1.0.patch similarity index 100% rename from patches/server/0018-Virtual-threads-1.0.patch rename to patches/server/0020-Virtual-threads-1.0.patch diff --git a/patches/server/0019-Virtual-Thread-2.0-Beta.patch b/patches/server/0021-Virtual-Thread-2.0-Beta.patch similarity index 100% rename from patches/server/0019-Virtual-Thread-2.0-Beta.patch rename to patches/server/0021-Virtual-Thread-2.0-Beta.patch diff --git a/patches/server/0020-SectorFile.patch b/patches/server/0022-SectorFile.patch similarity index 100% rename from patches/server/0020-SectorFile.patch rename to patches/server/0022-SectorFile.patch diff --git a/patches/server/0021-Linear.patch b/patches/server/0023-Linear.patch similarity index 100% rename from patches/server/0021-Linear.patch rename to patches/server/0023-Linear.patch diff --git a/patches/server/0022-BossBarTask.patch b/patches/server/0024-BossBarTask.patch similarity index 100% rename from patches/server/0022-BossBarTask.patch rename to patches/server/0024-BossBarTask.patch diff --git a/patches/server/0023-GLOBAL_SOUND-is-disabled-by-default.patch b/patches/server/0025-GLOBAL_SOUND-is-disabled-by-default.patch similarity index 100% rename from patches/server/0023-GLOBAL_SOUND-is-disabled-by-default.patch rename to patches/server/0025-GLOBAL_SOUND-is-disabled-by-default.patch diff --git a/patches/server/0024-The-anvil-becomes-a-drop-at-Y0.patch b/patches/server/0026-The-anvil-becomes-a-drop-at-Y0.patch similarity index 100% rename from patches/server/0024-The-anvil-becomes-a-drop-at-Y0.patch rename to patches/server/0026-The-anvil-becomes-a-drop-at-Y0.patch diff --git a/patches/server/0025-Disable-respawn-ceiling.patch b/patches/server/0027-Disable-respawn-ceiling.patch similarity index 100% rename from patches/server/0025-Disable-respawn-ceiling.patch rename to patches/server/0027-Disable-respawn-ceiling.patch diff --git a/patches/server/0026-Store-gamerules-in-fastutil-hashmap.patch b/patches/server/0028-Store-gamerules-in-fastutil-hashmap.patch similarity index 100% rename from patches/server/0026-Store-gamerules-in-fastutil-hashmap.patch rename to patches/server/0028-Store-gamerules-in-fastutil-hashmap.patch diff --git a/patches/server/0027-disable-spark.patch b/patches/server/0029-disable-spark.patch similarity index 100% rename from patches/server/0027-disable-spark.patch rename to patches/server/0029-disable-spark.patch diff --git a/patches/server/0028-SIMD-support-range-adjustment.patch b/patches/server/0030-SIMD-support-range-adjustment.patch similarity index 100% rename from patches/server/0028-SIMD-support-range-adjustment.patch rename to patches/server/0030-SIMD-support-range-adjustment.patch diff --git a/patches/server/0029-Skip-empty-events.patch b/patches/server/0031-Skip-empty-events.patch similarity index 100% rename from patches/server/0029-Skip-empty-events.patch rename to patches/server/0031-Skip-empty-events.patch diff --git a/patches/server/0030-Leaf-Fix-MC-119417.patch b/patches/server/0032-Leaf-Fix-MC-119417.patch similarity index 100% rename from patches/server/0030-Leaf-Fix-MC-119417.patch rename to patches/server/0032-Leaf-Fix-MC-119417.patch diff --git a/patches/server/0031-Leaf-Fix-MC-266334.patch b/patches/server/0033-Leaf-Fix-MC-266334.patch similarity index 100% rename from patches/server/0031-Leaf-Fix-MC-266334.patch rename to patches/server/0033-Leaf-Fix-MC-266334.patch diff --git a/patches/server/0032-Leaf-Fix-MC-200418.patch b/patches/server/0034-Leaf-Fix-MC-200418.patch similarity index 100% rename from patches/server/0032-Leaf-Fix-MC-200418.patch rename to patches/server/0034-Leaf-Fix-MC-200418.patch diff --git a/patches/server/0033-Leaf-Fix-MC-183518.patch b/patches/server/0035-Leaf-Fix-MC-183518.patch similarity index 100% rename from patches/server/0033-Leaf-Fix-MC-183518.patch rename to patches/server/0035-Leaf-Fix-MC-183518.patch diff --git a/patches/server/0034-Leaf-Fix-sprint-glitch.patch b/patches/server/0036-Leaf-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0034-Leaf-Fix-sprint-glitch.patch rename to patches/server/0036-Leaf-Fix-sprint-glitch.patch diff --git a/patches/server/0035-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch b/patches/server/0037-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch similarity index 100% rename from patches/server/0035-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch rename to patches/server/0037-Leaf-Remove-stream-in-BlockBehaviour-cache-blockstat.patch diff --git a/patches/server/0036-Leaf-Don-t-save-falling-block-entity.patch b/patches/server/0038-Leaf-Don-t-save-falling-block-entity.patch similarity index 100% rename from patches/server/0036-Leaf-Don-t-save-falling-block-entity.patch rename to patches/server/0038-Leaf-Don-t-save-falling-block-entity.patch diff --git a/patches/server/0037-Leaf-Don-t-save-primed-tnt-entity.patch b/patches/server/0039-Leaf-Don-t-save-primed-tnt-entity.patch similarity index 100% rename from patches/server/0037-Leaf-Don-t-save-primed-tnt-entity.patch rename to patches/server/0039-Leaf-Don-t-save-primed-tnt-entity.patch diff --git a/patches/server/0038-Leaf-Optimize-Minecart-collisions.patch b/patches/server/0040-Leaf-Optimize-Minecart-collisions.patch similarity index 100% rename from patches/server/0038-Leaf-Optimize-Minecart-collisions.patch rename to patches/server/0040-Leaf-Optimize-Minecart-collisions.patch diff --git a/patches/server/0039-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch b/patches/server/0041-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch similarity index 100% rename from patches/server/0039-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch rename to patches/server/0041-Leaf-Faster-sequencing-of-futures-for-chunk-structur.patch diff --git a/patches/server/0040-Leaf-Cache-player-profileResult.patch b/patches/server/0042-Leaf-Cache-player-profileResult.patch similarity index 97% rename from patches/server/0040-Leaf-Cache-player-profileResult.patch rename to patches/server/0042-Leaf-Cache-player-profileResult.patch index 6744211..f81419f 100644 --- a/patches/server/0040-Leaf-Cache-player-profileResult.patch +++ b/patches/server/0042-Leaf-Cache-player-profileResult.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Leaf: Cache player profileResult diff --git a/build.gradle.kts b/build.gradle.kts -index abd320434647bf901ed79e6a1bf2fa50908c437c..42f1bde01585886868590902844bb27e186cfd68 100644 +index 0dfe4f14099d5e3ff4da943d32bd14a1e788d903..4777451dc9378f1bed1c5f663cf444dabe42ff4e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -106,6 +106,7 @@ dependencies { diff --git a/patches/server/0041-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch b/patches/server/0043-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch similarity index 100% rename from patches/server/0041-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch rename to patches/server/0043-Leaf-Use-caffeine-cache-kickPermission-instead-of-us.patch diff --git a/patches/server/0042-Leaves-Zero-tick-plants.patch b/patches/server/0044-Leaves-Zero-tick-plants.patch similarity index 100% rename from patches/server/0042-Leaves-Zero-tick-plants.patch rename to patches/server/0044-Leaves-Zero-tick-plants.patch diff --git a/patches/server/0043-Leaves-Entity-Utils.patch b/patches/server/0045-Leaves-Entity-Utils.patch similarity index 100% rename from patches/server/0043-Leaves-Entity-Utils.patch rename to patches/server/0045-Leaves-Entity-Utils.patch diff --git a/patches/server/0044-Leaves-Return-nether-portal-fix.patch b/patches/server/0046-Leaves-Return-nether-portal-fix.patch similarity index 100% rename from patches/server/0044-Leaves-Return-nether-portal-fix.patch rename to patches/server/0046-Leaves-Return-nether-portal-fix.patch diff --git a/patches/server/0045-Leaves-Vanilla-hopper.patch b/patches/server/0047-Leaves-Vanilla-hopper.patch similarity index 100% rename from patches/server/0045-Leaves-Vanilla-hopper.patch rename to patches/server/0047-Leaves-Vanilla-hopper.patch diff --git a/patches/server/0046-Leaves-Raider-die-skip-self-raid-check.patch b/patches/server/0048-Leaves-Raider-die-skip-self-raid-check.patch similarity index 100% rename from patches/server/0046-Leaves-Raider-die-skip-self-raid-check.patch rename to patches/server/0048-Leaves-Raider-die-skip-self-raid-check.patch diff --git a/patches/server/0047-Leaves-Fix-villagers-dont-release-memory.patch b/patches/server/0049-Leaves-Fix-villagers-dont-release-memory.patch similarity index 100% rename from patches/server/0047-Leaves-Fix-villagers-dont-release-memory.patch rename to patches/server/0049-Leaves-Fix-villagers-dont-release-memory.patch diff --git a/patches/server/0048-Leaves-Fix-falling-block-s-block-location.patch b/patches/server/0050-Leaves-Fix-falling-block-s-block-location.patch similarity index 100% rename from patches/server/0048-Leaves-Fix-falling-block-s-block-location.patch rename to patches/server/0050-Leaves-Fix-falling-block-s-block-location.patch diff --git a/patches/server/0049-Pufferfish-Optimize-entity-coordinate-key.patch b/patches/server/0051-Pufferfish-Optimize-entity-coordinate-key.patch similarity index 100% rename from patches/server/0049-Pufferfish-Optimize-entity-coordinate-key.patch rename to patches/server/0051-Pufferfish-Optimize-entity-coordinate-key.patch diff --git a/patches/server/0050-Pufferfish-Improve-container-checking-with-a-bitset.patch b/patches/server/0052-Pufferfish-Improve-container-checking-with-a-bitset.patch similarity index 100% rename from patches/server/0050-Pufferfish-Improve-container-checking-with-a-bitset.patch rename to patches/server/0052-Pufferfish-Improve-container-checking-with-a-bitset.patch diff --git a/patches/server/0051-Mobtimizations-RePathing-optimization.patch b/patches/server/0053-Mobtimizations-RePathing-optimization.patch similarity index 100% rename from patches/server/0051-Mobtimizations-RePathing-optimization.patch rename to patches/server/0053-Mobtimizations-RePathing-optimization.patch diff --git a/patches/server/0052-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch b/patches/server/0054-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch similarity index 100% rename from patches/server/0052-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch rename to patches/server/0054-Mobtimizations-Optimization-Zombie-Search-And-Destro.patch diff --git a/patches/server/0053-Divine-Implement-Secure-Seed.patch b/patches/server/0055-Divine-Implement-Secure-Seed.patch similarity index 99% rename from patches/server/0053-Divine-Implement-Secure-Seed.patch rename to patches/server/0055-Divine-Implement-Secure-Seed.patch index 1ebb121..0893187 100644 --- a/patches/server/0053-Divine-Implement-Secure-Seed.patch +++ b/patches/server/0055-Divine-Implement-Secure-Seed.patch @@ -535,7 +535,7 @@ index 70dbf7267b43357578c07fcd46618f656410a8e2..1a76d356c07262344a5d2dffe0d41e3e Rotation rotation = Rotation.getRandom(worldgenRandom); StructureTemplatePool structureTemplatePool = structurePool.unwrapKey() diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index 4d9438c2c351058eba536fc05d84f1751226754c..da26299242edc71b210bc146793f7db69cbd636f 100644 +index 0aa23076acd87ae5d9b5c079831ce2619c1acb6f..4a7ae711b21e8095f7ae2b92f6e9a506fbd7d9e8 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java @@ -268,6 +268,9 @@ import io.multipaper.shreddedpaper.region.ShreddedPaperRegionSchedulerApiImpl; @@ -548,7 +548,7 @@ index 4d9438c2c351058eba536fc05d84f1751226754c..da26299242edc71b210bc146793f7db6 public final class CraftServer implements Server { private final String serverName = io.papermc.paper.ServerBuildInfo.buildInfo().brandName(); // Paper private final String serverVersion; -@@ -1387,7 +1390,7 @@ public final class CraftServer implements Server { +@@ -1389,7 +1392,7 @@ public final class CraftServer implements Server { iregistrycustom_dimension = leveldataanddimensions.dimensions().dimensionsRegistryAccess(); } else { LevelSettings worldsettings; diff --git a/patches/server/0054-Divine-Fix-MC-31819.patch b/patches/server/0056-Divine-Fix-MC-31819.patch similarity index 100% rename from patches/server/0054-Divine-Fix-MC-31819.patch rename to patches/server/0056-Divine-Fix-MC-31819.patch diff --git a/patches/server/0055-Divine-Fix-MC-172801.patch b/patches/server/0057-Divine-Fix-MC-172801.patch similarity index 100% rename from patches/server/0055-Divine-Fix-MC-172801.patch rename to patches/server/0057-Divine-Fix-MC-172801.patch diff --git a/patches/server/0056-Divine-Fix-MC-2025.patch b/patches/server/0058-Divine-Fix-MC-2025.patch similarity index 100% rename from patches/server/0056-Divine-Fix-MC-2025.patch rename to patches/server/0058-Divine-Fix-MC-2025.patch diff --git a/patches/server/0057-Divine-C2ME-reduce_allocs.patch b/patches/server/0059-Divine-C2ME-reduce_allocs.patch similarity index 100% rename from patches/server/0057-Divine-C2ME-reduce_allocs.patch rename to patches/server/0059-Divine-C2ME-reduce_allocs.patch diff --git a/patches/server/0058-Divine-C2ME-opts-math.patch b/patches/server/0060-Divine-C2ME-opts-math.patch similarity index 100% rename from patches/server/0058-Divine-C2ME-opts-math.patch rename to patches/server/0060-Divine-C2ME-opts-math.patch diff --git a/patches/server/0059-Divine-Fix-MC-7569.patch b/patches/server/0061-Divine-Fix-MC-7569.patch similarity index 100% rename from patches/server/0059-Divine-Fix-MC-7569.patch rename to patches/server/0061-Divine-Fix-MC-7569.patch diff --git a/patches/server/0060-Divine-lithium-math.sine_lut.patch b/patches/server/0062-Divine-lithium-math.sine_lut.patch similarity index 100% rename from patches/server/0060-Divine-lithium-math.sine_lut.patch rename to patches/server/0062-Divine-lithium-math.sine_lut.patch diff --git a/patches/server/0061-Divine-lithium-cached_hashcode.patch b/patches/server/0063-Divine-lithium-cached_hashcode.patch similarity index 100% rename from patches/server/0061-Divine-lithium-cached_hashcode.patch rename to patches/server/0063-Divine-lithium-cached_hashcode.patch diff --git a/patches/server/0062-Divine-Fix-MC-93826.patch b/patches/server/0064-Divine-Fix-MC-93826.patch similarity index 100% rename from patches/server/0062-Divine-Fix-MC-93826.patch rename to patches/server/0064-Divine-Fix-MC-93826.patch diff --git a/patches/server/0063-Divine-Fix-MC-110386.patch b/patches/server/0065-Divine-Fix-MC-110386.patch similarity index 100% rename from patches/server/0063-Divine-Fix-MC-110386.patch rename to patches/server/0065-Divine-Fix-MC-110386.patch diff --git a/patches/server/0064-Divine-Fix-MC-98160-and-MC-105103.patch b/patches/server/0066-Divine-Fix-MC-98160-and-MC-105103.patch similarity index 100% rename from patches/server/0064-Divine-Fix-MC-98160-and-MC-105103.patch rename to patches/server/0066-Divine-Fix-MC-98160-and-MC-105103.patch diff --git a/patches/server/0065-Divine-Fix-MC-93018.patch b/patches/server/0067-Divine-Fix-MC-93018.patch similarity index 100% rename from patches/server/0065-Divine-Fix-MC-93018.patch rename to patches/server/0067-Divine-Fix-MC-93018.patch diff --git a/patches/server/0066-Divine-Fix-MC-65198.patch b/patches/server/0068-Divine-Fix-MC-65198.patch similarity index 100% rename from patches/server/0066-Divine-Fix-MC-65198.patch rename to patches/server/0068-Divine-Fix-MC-65198.patch diff --git a/patches/server/0067-Divine-Fix-MC-167242.patch b/patches/server/0069-Divine-Fix-MC-167242.patch similarity index 100% rename from patches/server/0067-Divine-Fix-MC-167242.patch rename to patches/server/0069-Divine-Fix-MC-167242.patch diff --git a/patches/server/0068-Canvas-Dont-load-chunks-to-spawn-phantoms.patch b/patches/server/0070-Canvas-Dont-load-chunks-to-spawn-phantoms.patch similarity index 100% rename from patches/server/0068-Canvas-Dont-load-chunks-to-spawn-phantoms.patch rename to patches/server/0070-Canvas-Dont-load-chunks-to-spawn-phantoms.patch diff --git a/patches/server/0069-Canvas-Optimize-Math.round-and-Math.hypot.patch b/patches/server/0071-Canvas-Optimize-Math.round-and-Math.hypot.patch similarity index 100% rename from patches/server/0069-Canvas-Optimize-Math.round-and-Math.hypot.patch rename to patches/server/0071-Canvas-Optimize-Math.round-and-Math.hypot.patch diff --git a/patches/server/0070-Canvas-Entity-Goal-Optimizations.patch b/patches/server/0072-Canvas-Entity-Goal-Optimizations.patch similarity index 100% rename from patches/server/0070-Canvas-Entity-Goal-Optimizations.patch rename to patches/server/0072-Canvas-Entity-Goal-Optimizations.patch diff --git a/patches/server/0071-Canvas-Optimize-Entity-Pathfinding.patch b/patches/server/0073-Canvas-Optimize-Entity-Pathfinding.patch similarity index 100% rename from patches/server/0071-Canvas-Optimize-Entity-Pathfinding.patch rename to patches/server/0073-Canvas-Optimize-Entity-Pathfinding.patch diff --git a/patches/server/0072-CarpetFix-incorrectBounceLogicFix.patch b/patches/server/0074-CarpetFix-incorrectBounceLogicFix.patch similarity index 100% rename from patches/server/0072-CarpetFix-incorrectBounceLogicFix.patch rename to patches/server/0074-CarpetFix-incorrectBounceLogicFix.patch diff --git a/patches/server/0073-CarpetFix-explosionBreaksItemFrameInWaterFix.patch b/patches/server/0075-CarpetFix-explosionBreaksItemFrameInWaterFix.patch similarity index 100% rename from patches/server/0073-CarpetFix-explosionBreaksItemFrameInWaterFix.patch rename to patches/server/0075-CarpetFix-explosionBreaksItemFrameInWaterFix.patch diff --git a/patches/server/0074-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch b/patches/server/0076-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch similarity index 100% rename from patches/server/0074-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch rename to patches/server/0076-Carpet-TIS-Addition-Random-flatten-triangular-distri.patch diff --git a/patches/server/0075-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch b/patches/server/0077-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch similarity index 100% rename from patches/server/0075-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch rename to patches/server/0077-SparklyPaper-Skip-distanceToSqr-call-in-ServerEntity.patch diff --git a/patches/server/0076-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch b/patches/server/0078-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch similarity index 100% rename from patches/server/0076-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch rename to patches/server/0078-SparklyPaper-Skip-dirty-stats-copy-when-requesting-p.patch diff --git a/patches/server/0077-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch b/patches/server/0079-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch similarity index 100% rename from patches/server/0077-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch rename to patches/server/0079-SparklyPaper-Reset-dirty-flag-when-loading-maps-from.patch diff --git a/patches/server/0078-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch b/patches/server/0080-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch similarity index 100% rename from patches/server/0078-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch rename to patches/server/0080-SparklyPaper-Rewrite-framed-map-tracker-ticking.patch diff --git a/patches/server/0079-Gale-Use-platform-math-functions.patch b/patches/server/0081-Gale-Use-platform-math-functions.patch similarity index 100% rename from patches/server/0079-Gale-Use-platform-math-functions.patch rename to patches/server/0081-Gale-Use-platform-math-functions.patch diff --git a/patches/server/0080-Gale-Faster-floating-point-positive-modulo.patch b/patches/server/0082-Gale-Faster-floating-point-positive-modulo.patch similarity index 100% rename from patches/server/0080-Gale-Faster-floating-point-positive-modulo.patch rename to patches/server/0082-Gale-Faster-floating-point-positive-modulo.patch diff --git a/patches/server/0081-Gale-Specific-interval-TPS-API.patch b/patches/server/0083-Gale-Specific-interval-TPS-API.patch similarity index 88% rename from patches/server/0081-Gale-Specific-interval-TPS-API.patch rename to patches/server/0083-Gale-Specific-interval-TPS-API.patch index 330802d..c919f7c 100644 --- a/patches/server/0081-Gale-Specific-interval-TPS-API.patch +++ b/patches/server/0083-Gale-Specific-interval-TPS-API.patch @@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html) Gale - https://galemc.org diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -index da26299242edc71b210bc146793f7db69cbd636f..08d2a14210f5f30a0a0b3a3b08d0c6a99a9cda1e 100644 +index 4a7ae711b21e8095f7ae2b92f6e9a506fbd7d9e8..5322f8f92f25a9f381e8d2a53f3c1815872d95c3 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java -@@ -3184,6 +3184,23 @@ public final class CraftServer implements Server { +@@ -3186,6 +3186,23 @@ public final class CraftServer implements Server { }; } diff --git a/patches/server/0082-Gale-Reduce-block-destruction-packet-allocations.patch b/patches/server/0084-Gale-Reduce-block-destruction-packet-allocations.patch similarity index 100% rename from patches/server/0082-Gale-Reduce-block-destruction-packet-allocations.patch rename to patches/server/0084-Gale-Reduce-block-destruction-packet-allocations.patch diff --git a/patches/server/0083-Gale-Optimize-matching-item-checks.patch b/patches/server/0085-Gale-Optimize-matching-item-checks.patch similarity index 100% rename from patches/server/0083-Gale-Optimize-matching-item-checks.patch rename to patches/server/0085-Gale-Optimize-matching-item-checks.patch diff --git a/patches/server/0084-Gale-Store-mob-counts-in-an-array.patch b/patches/server/0086-Gale-Store-mob-counts-in-an-array.patch similarity index 100% rename from patches/server/0084-Gale-Store-mob-counts-in-an-array.patch rename to patches/server/0086-Gale-Store-mob-counts-in-an-array.patch diff --git a/patches/server/0085-Gale-For-collision-check-has-physics-before-same-veh.patch b/patches/server/0087-Gale-For-collision-check-has-physics-before-same-veh.patch similarity index 100% rename from patches/server/0085-Gale-For-collision-check-has-physics-before-same-veh.patch rename to patches/server/0087-Gale-For-collision-check-has-physics-before-same-veh.patch diff --git a/patches/server/0086-Gale-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0088-Gale-Skip-negligible-planar-movement-multiplication.patch similarity index 100% rename from patches/server/0086-Gale-Skip-negligible-planar-movement-multiplication.patch rename to patches/server/0088-Gale-Skip-negligible-planar-movement-multiplication.patch diff --git a/patches/server/0087-Gale-Pre-compute-VarLong-sizes.patch b/patches/server/0089-Gale-Pre-compute-VarLong-sizes.patch similarity index 100% rename from patches/server/0087-Gale-Pre-compute-VarLong-sizes.patch rename to patches/server/0089-Gale-Pre-compute-VarLong-sizes.patch diff --git a/patches/server/0088-Gale-Optimize-VarInt-write-and-VarLong-write.patch b/patches/server/0090-Gale-Optimize-VarInt-write-and-VarLong-write.patch similarity index 100% rename from patches/server/0088-Gale-Optimize-VarInt-write-and-VarLong-write.patch rename to patches/server/0090-Gale-Optimize-VarInt-write-and-VarLong-write.patch diff --git a/patches/server/0089-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0091-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch similarity index 100% rename from patches/server/0089-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch rename to patches/server/0091-Gale-Don-t-load-chunks-to-activate-climbing-entities.patch diff --git a/patches/server/0090-Gale-Reduce-acquire-POI-for-stuck-entities.patch b/patches/server/0092-Gale-Reduce-acquire-POI-for-stuck-entities.patch similarity index 100% rename from patches/server/0090-Gale-Reduce-acquire-POI-for-stuck-entities.patch rename to patches/server/0092-Gale-Reduce-acquire-POI-for-stuck-entities.patch diff --git a/patches/server/0091-MemoryLeakFix-Biome.patch b/patches/server/0093-MemoryLeakFix-Biome.patch similarity index 100% rename from patches/server/0091-MemoryLeakFix-Biome.patch rename to patches/server/0093-MemoryLeakFix-Biome.patch diff --git a/patches/server/0092-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch b/patches/server/0094-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch similarity index 100% rename from patches/server/0092-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch rename to patches/server/0094-Paper-Check-for-block-type-in-SculkSensorBlock-canAc.patch diff --git a/patches/server/0093-Paper-Update-Alternate-Current-to-v1.9.patch b/patches/server/0095-Paper-Update-Alternate-Current-to-v1.9.patch similarity index 100% rename from patches/server/0093-Paper-Update-Alternate-Current-to-v1.9.patch rename to patches/server/0095-Paper-Update-Alternate-Current-to-v1.9.patch diff --git a/patches/server/0094-Paper-PR-Update-Velocity-natives.patch b/patches/server/0096-Paper-PR-Update-Velocity-natives.patch similarity index 100% rename from patches/server/0094-Paper-PR-Update-Velocity-natives.patch rename to patches/server/0096-Paper-PR-Update-Velocity-natives.patch diff --git a/patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch b/patches/server/0097-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch similarity index 100% rename from patches/server/0095-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch rename to patches/server/0097-Paper-PR-Reduce-work-done-in-CraftMapCanvas.drawImag.patch diff --git a/patches/server/0096-Paper-PR-Change-condition-check-order-of-entity-trac.patch b/patches/server/0098-Paper-PR-Change-condition-check-order-of-entity-trac.patch similarity index 100% rename from patches/server/0096-Paper-PR-Change-condition-check-order-of-entity-trac.patch rename to patches/server/0098-Paper-PR-Change-condition-check-order-of-entity-trac.patch diff --git a/patches/server/0097-Paper-PR-Fix-fetching-biomes-during-world-generation.patch b/patches/server/0099-Paper-PR-Fix-fetching-biomes-during-world-generation.patch similarity index 100% rename from patches/server/0097-Paper-PR-Fix-fetching-biomes-during-world-generation.patch rename to patches/server/0099-Paper-PR-Fix-fetching-biomes-during-world-generation.patch diff --git a/patches/server/0098-lithium-precompute-shape-arrays.patch b/patches/server/0100-lithium-precompute-shape-arrays.patch similarity index 100% rename from patches/server/0098-lithium-precompute-shape-arrays.patch rename to patches/server/0100-lithium-precompute-shape-arrays.patch diff --git a/patches/server/0099-lithium-fast-powder-snow-check.patch b/patches/server/0101-lithium-fast-powder-snow-check.patch similarity index 100% rename from patches/server/0099-lithium-fast-powder-snow-check.patch rename to patches/server/0101-lithium-fast-powder-snow-check.patch diff --git a/patches/server/0100-vmp-TypeFilterableList.patch b/patches/server/0102-vmp-TypeFilterableList.patch similarity index 100% rename from patches/server/0100-vmp-TypeFilterableList.patch rename to patches/server/0102-vmp-TypeFilterableList.patch diff --git a/patches/server/0101-Slice-Improve-map-saving-performance.patch b/patches/server/0103-Slice-Improve-map-saving-performance.patch similarity index 100% rename from patches/server/0101-Slice-Improve-map-saving-performance.patch rename to patches/server/0103-Slice-Improve-map-saving-performance.patch diff --git a/patches/server/0102-Slice-noEntityCollisions-for-Entity.patch b/patches/server/0104-Slice-noEntityCollisions-for-Entity.patch similarity index 100% rename from patches/server/0102-Slice-noEntityCollisions-for-Entity.patch rename to patches/server/0104-Slice-noEntityCollisions-for-Entity.patch diff --git a/patches/server/0103-Slice-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0105-Slice-Allow-inventory-clicks-in-Spectator.patch similarity index 100% rename from patches/server/0103-Slice-Allow-inventory-clicks-in-Spectator.patch rename to patches/server/0105-Slice-Allow-inventory-clicks-in-Spectator.patch diff --git a/patches/server/0104-Slice-Disable-sending-Entity-Movement-Packets.patch b/patches/server/0106-Slice-Disable-sending-Entity-Movement-Packets.patch similarity index 100% rename from patches/server/0104-Slice-Disable-sending-Entity-Movement-Packets.patch rename to patches/server/0106-Slice-Disable-sending-Entity-Movement-Packets.patch diff --git a/patches/server/0105-Akarin-Save-Json-list-asynchronously.patch b/patches/server/0107-Akarin-Save-Json-list-asynchronously.patch similarity index 100% rename from patches/server/0105-Akarin-Save-Json-list-asynchronously.patch rename to patches/server/0107-Akarin-Save-Json-list-asynchronously.patch diff --git a/patches/server/0106-Airplane-Remove-stream-in-PoiCompetitorScan.patch b/patches/server/0108-Airplane-Remove-stream-in-PoiCompetitorScan.patch similarity index 100% rename from patches/server/0106-Airplane-Remove-stream-in-PoiCompetitorScan.patch rename to patches/server/0108-Airplane-Remove-stream-in-PoiCompetitorScan.patch diff --git a/patches/server/0107-ScalableLux-Upstream-Starlight-Fix.patch b/patches/server/0109-ScalableLux-Upstream-Starlight-Fix.patch similarity index 100% rename from patches/server/0107-ScalableLux-Upstream-Starlight-Fix.patch rename to patches/server/0109-ScalableLux-Upstream-Starlight-Fix.patch diff --git a/patches/server/0108-Kiterino-New-liquid-physics.patch b/patches/server/0110-Kiterino-New-liquid-physics.patch similarity index 100% rename from patches/server/0108-Kiterino-New-liquid-physics.patch rename to patches/server/0110-Kiterino-New-liquid-physics.patch