diff --git a/patches/server/0035-Leaves-Fix-vehicle-teleport-by-end-gateway.patch b/patches/server/0035-Leaves-Fix-vehicle-teleport-by-end-gateway.patch new file mode 100644 index 000000000..05b02dd8e --- /dev/null +++ b/patches/server/0035-Leaves-Fix-vehicle-teleport-by-end-gateway.patch @@ -0,0 +1,54 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: violetc <58360096+s-yh-china@users.noreply.github.com> +Date: Tue, 15 Aug 2023 22:40:42 +0800 +Subject: [PATCH] Leaves: Fix vehicle teleport by end gateway + +Original license: GPLv3 +Original project: https://github.com/LeavesMC/Leaves + +diff --git a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +index 5717b1c2fd5b16d439499296edd35d72b6613212..2cc37cf1c3e8f7c8fdd6c1b9cfad02283f8f1dec 100644 +--- a/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java ++++ b/src/main/java/net/minecraft/world/level/block/entity/TheEndGatewayBlockEntity.java +@@ -229,7 +229,7 @@ public class TheEndGatewayBlockEntity extends TheEndPortalBlockEntity { + + entity1.setPortalCooldown(); + ((ServerPlayer) entity1).connection.teleport(teleEvent.getTo()); +- entity1.teleportPassengers(); // Paper - teleport passengers as well, preventing invisible passengers post teleport. ++ if (!org.dreeam.leaf.config.modules.gameplay.UseVanillaEndTeleport.enabled) entity1.teleportPassengers(); // Paper - teleport passengers as well, preventing invisible passengers post teleport. // Leaf - Leaves - vanilla + TheEndGatewayBlockEntity.triggerCooldown(world, pos, state, blockEntity); // CraftBukkit - call at end of method + return; + +diff --git a/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseVanillaEndTeleport.java b/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseVanillaEndTeleport.java +new file mode 100644 +index 0000000000000000000000000000000000000000..778f428eaaf22236e52aa4b670f5ec34996ea862 +--- /dev/null ++++ b/src/main/java/org/dreeam/leaf/config/modules/gameplay/UseVanillaEndTeleport.java +@@ -0,0 +1,27 @@ ++package org.dreeam.leaf.config.modules.gameplay; ++ ++import com.electronwill.nightconfig.core.file.CommentedFileConfig; ++import org.dreeam.leaf.config.ConfigInfo; ++import org.dreeam.leaf.config.EnumConfigCategory; ++import org.dreeam.leaf.config.IConfigModule; ++ ++public class UseVanillaEndTeleport implements IConfigModule { ++ ++ @Override ++ public EnumConfigCategory getCategory() { ++ return EnumConfigCategory.GAMEPLAY; ++ } ++ ++ @Override ++ public String getBaseName() { ++ return "use_vanilla_end_teleport"; ++ } ++ ++ @ConfigInfo(baseName = "enabled") ++ public static boolean enabled = false; ++ ++ @Override ++ public void onLoaded(CommentedFileConfig config) { ++ config.setComment("gameplay.use_vanilla_end_teleport", "Enable to Use Vanilla End Gateway Teleport"); ++ } ++} diff --git a/patches/server/0035-Fix-Make-log4j-compatible-with-future-release.patch b/patches/server/0036-Fix-Make-log4j-compatible-with-future-release.patch similarity index 100% rename from patches/server/0035-Fix-Make-log4j-compatible-with-future-release.patch rename to patches/server/0036-Fix-Make-log4j-compatible-with-future-release.patch diff --git a/patches/server/0036-Sync-with-Gale-s-Optimize-villager-data-storage.patc.patch b/patches/server/0037-Sync-with-Gale-s-Optimize-villager-data-storage.patc.patch similarity index 100% rename from patches/server/0036-Sync-with-Gale-s-Optimize-villager-data-storage.patc.patch rename to patches/server/0037-Sync-with-Gale-s-Optimize-villager-data-storage.patc.patch diff --git a/patches/server/0037-Sync-with-Gale-s-Optimize-sun-burn-tick.patch.patch b/patches/server/0038-Sync-with-Gale-s-Optimize-sun-burn-tick.patch.patch similarity index 97% rename from patches/server/0037-Sync-with-Gale-s-Optimize-sun-burn-tick.patch.patch rename to patches/server/0038-Sync-with-Gale-s-Optimize-sun-burn-tick.patch.patch index 7cb8e8e66..cedb8f01d 100644 --- a/patches/server/0037-Sync-with-Gale-s-Optimize-sun-burn-tick.patch.patch +++ b/patches/server/0038-Sync-with-Gale-s-Optimize-sun-burn-tick.patch.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Sync with Gale's Optimize-sun-burn-tick.patch diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java -index 1952c66202f51bdbca52fab03710ca0d76e0312d..98e673534927255b20f73238f6c213f256ec1694 100644 +index 1f8ca7bc71992d287dac964d0528e15bd39bfe3c..4bf569b6b81701ea2d45d090438686c5dbbd1744 100644 --- a/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java @@ -568,13 +568,29 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S diff --git a/patches/server/0038-Petal-Async-Pathfinding.patch b/patches/server/0039-Petal-Async-Pathfinding.patch similarity index 100% rename from patches/server/0038-Petal-Async-Pathfinding.patch rename to patches/server/0039-Petal-Async-Pathfinding.patch diff --git a/patches/server/0039-Petal-Multithreaded-Tracker.patch b/patches/server/0040-Petal-Multithreaded-Tracker.patch similarity index 100% rename from patches/server/0039-Petal-Multithreaded-Tracker.patch rename to patches/server/0040-Petal-Multithreaded-Tracker.patch diff --git a/patches/server/0040-Petal-reduce-work-done-by-game-event-system.patch b/patches/server/0041-Petal-reduce-work-done-by-game-event-system.patch similarity index 100% rename from patches/server/0040-Petal-reduce-work-done-by-game-event-system.patch rename to patches/server/0041-Petal-reduce-work-done-by-game-event-system.patch diff --git a/patches/server/0041-Fix-tracker-NPE.patch b/patches/server/0042-Fix-tracker-NPE.patch similarity index 100% rename from patches/server/0041-Fix-tracker-NPE.patch rename to patches/server/0042-Fix-tracker-NPE.patch diff --git a/patches/server/0042-Cache-minecart-vehicle-collision-results.patch b/patches/server/0043-Cache-minecart-vehicle-collision-results.patch similarity index 100% rename from patches/server/0042-Cache-minecart-vehicle-collision-results.patch rename to patches/server/0043-Cache-minecart-vehicle-collision-results.patch diff --git a/patches/server/0043-Reduce-canSee-work.patch b/patches/server/0044-Reduce-canSee-work.patch similarity index 100% rename from patches/server/0043-Reduce-canSee-work.patch rename to patches/server/0044-Reduce-canSee-work.patch diff --git a/patches/server/0044-Faster-Natural-Spawning.patch b/patches/server/0045-Faster-Natural-Spawning.patch similarity index 100% rename from patches/server/0044-Faster-Natural-Spawning.patch rename to patches/server/0045-Faster-Natural-Spawning.patch diff --git a/patches/server/0045-Faster-Random-for-xaeroMapServerID-generation.patch b/patches/server/0046-Faster-Random-for-xaeroMapServerID-generation.patch similarity index 100% rename from patches/server/0045-Faster-Random-for-xaeroMapServerID-generation.patch rename to patches/server/0046-Faster-Random-for-xaeroMapServerID-generation.patch diff --git a/patches/server/0046-Fix-casting-in-Purpur-world-config.patch b/patches/server/0047-Fix-casting-in-Purpur-world-config.patch similarity index 100% rename from patches/server/0046-Fix-casting-in-Purpur-world-config.patch rename to patches/server/0047-Fix-casting-in-Purpur-world-config.patch diff --git a/patches/server/0047-Fix-sprint-glitch.patch b/patches/server/0048-Fix-sprint-glitch.patch similarity index 100% rename from patches/server/0047-Fix-sprint-glitch.patch rename to patches/server/0048-Fix-sprint-glitch.patch diff --git a/patches/server/0048-Fix-keepalive-kicked-name.patch b/patches/server/0049-Fix-keepalive-kicked-name.patch similarity index 100% rename from patches/server/0048-Fix-keepalive-kicked-name.patch rename to patches/server/0049-Fix-keepalive-kicked-name.patch diff --git a/patches/server/0049-Configurable-movement-speed-of-more-entities.patch b/patches/server/0050-Configurable-movement-speed-of-more-entities.patch similarity index 100% rename from patches/server/0049-Configurable-movement-speed-of-more-entities.patch rename to patches/server/0050-Configurable-movement-speed-of-more-entities.patch diff --git a/patches/server/0050-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch b/patches/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch similarity index 100% rename from patches/server/0050-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch rename to patches/server/0051-Fix-TerminalConsoleAppender-NPE-error-on-server-clos.patch diff --git a/patches/server/0051-Faster-sequencing-of-futures-for-chunk-structure-gen.patch b/patches/server/0052-Faster-sequencing-of-futures-for-chunk-structure-gen.patch similarity index 100% rename from patches/server/0051-Faster-sequencing-of-futures-for-chunk-structure-gen.patch rename to patches/server/0052-Faster-sequencing-of-futures-for-chunk-structure-gen.patch diff --git a/patches/server/0052-Reduce-items-finding-hopper-nearby-check.patch b/patches/server/0053-Reduce-items-finding-hopper-nearby-check.patch similarity index 100% rename from patches/server/0052-Reduce-items-finding-hopper-nearby-check.patch rename to patches/server/0053-Reduce-items-finding-hopper-nearby-check.patch diff --git a/patches/server/0053-LinearPurpur-Add-Linear-region-format.patch b/patches/server/0054-LinearPurpur-Add-Linear-region-format.patch similarity index 99% rename from patches/server/0053-LinearPurpur-Add-Linear-region-format.patch rename to patches/server/0054-LinearPurpur-Add-Linear-region-format.patch index a5f448b12..9b750acb6 100644 --- a/patches/server/0053-LinearPurpur-Add-Linear-region-format.patch +++ b/patches/server/0054-LinearPurpur-Add-Linear-region-format.patch @@ -17,7 +17,7 @@ This format saves about 50% of disk space. Documentation: https://github.com/xymb-endcrystalme/LinearRegionFileFormatTools diff --git a/build.gradle.kts b/build.gradle.kts -index b1fd42d66874f29428a22570059f07696b487d5e..9d7cc530187263c6a4ed99df2c79d66d76749cc6 100644 +index f90321a70982e2a011f330968483ff1d12164e1b..5c14f2a186509e9f4a7a525320cc7492be939b7c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -32,6 +32,8 @@ dependencies { @@ -118,7 +118,7 @@ index 8dffb330b474b830d2f816ecf8be2e8d2e4556cd..bed46642b59d38e58e6aa663a47cbfc9 long expectedChunks = (long)regionFiles.length * (32L * 32L); // Gale start - instantly continue on world upgrade finish diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java -index 6da8bd049f3a9838383864df03a042b996f8e8a9..754fff2c0305f2bf5ce1d080f0f0d9128a0fbb2e 100644 +index 2544c8022ed0fdebc407fc85350041d77247d168..78b787edacb65496eb7d84b452dc637deaa094e4 100644 --- a/src/main/java/net/minecraft/server/MinecraftServer.java +++ b/src/main/java/net/minecraft/server/MinecraftServer.java @@ -866,7 +866,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop