diff --git a/patches/server/0058-Fix-MC-123848.patch b/patches/server/0058-Fix-MC-123848.patch new file mode 100644 index 0000000..27c6fb8 --- /dev/null +++ b/patches/server/0058-Fix-MC-123848.patch @@ -0,0 +1,46 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: MartijnMuijsers +Date: Tue, 29 Nov 2022 16:25:51 +0100 +Subject: [PATCH] Fix MC-123848 + +License: MIT (https://opensource.org/licenses/MIT) + +This patch is based on the following patch: +"Fix MC-123848" +By: BillyGalbreath +As part of: Purpur (https://github.com/PurpurMC/Purpur) +Licensed under: MIT (https://opensource.org/licenses/MIT) + +diff --git a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +index b9cb39efe14a877ddedc5a5e4141ee5199ea8daf..bf2a4e129edf2c919c3e422756c67ea904b83b00 100644 +--- a/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java ++++ b/src/main/java/net/minecraft/world/entity/decoration/ItemFrame.java +@@ -282,6 +282,16 @@ public class ItemFrame extends HangingEntity { + } + } + ++ // Gale start - Purpur - fix MC-123848 ++ @Nullable ++ public net.minecraft.world.entity.item.ItemEntity spawnAtLocation(ItemStack stack) { ++ if (!this.level.galeConfig().gameplayMechanics.fixes.mc123848) { ++ return this.spawnAtLocation(stack); ++ } ++ return this.spawnAtLocation(stack, getDirection().equals(Direction.DOWN) ? -0.6F : 0.0F); ++ } ++ // Gale end - Purpur - fix MC-123848 ++ + private void removeFramedMap(ItemStack itemstack) { + // Paper start - fix MC-252817 (green map markers do not disappear) + this.getFramedMapIdFromItem(itemstack).ifPresent((i) -> { +diff --git a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +index db8d97a14d1334c231732cc03c1f85a107b52a34..2dd5729366c463781b686a050f6e10e96d1595d4 100644 +--- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java ++++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +@@ -248,6 +248,7 @@ public class GaleWorldConfiguration extends ConfigurationPart { + public class Fixes extends ConfigurationPart { + public boolean sandDuping = true; // Gale - Purpur - make sand duping fix configurable + public boolean mc238526 = false; // Gale - Purpur - fix MC-238526 ++ public boolean mc123848 = false; // Gale - Purpur - fix MC-123848 + } + + } diff --git a/patches/server/0058-Reduce-array-allocations.patch b/patches/server/0059-Reduce-array-allocations.patch similarity index 100% rename from patches/server/0058-Reduce-array-allocations.patch rename to patches/server/0059-Reduce-array-allocations.patch diff --git a/patches/server/0059-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/patches/server/0060-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch similarity index 100% rename from patches/server/0059-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch rename to patches/server/0060-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch diff --git a/patches/server/0060-Measure-last-tick-time.patch b/patches/server/0061-Measure-last-tick-time.patch similarity index 100% rename from patches/server/0060-Measure-last-tick-time.patch rename to patches/server/0061-Measure-last-tick-time.patch diff --git a/patches/server/0061-Last-tick-time-API.patch b/patches/server/0062-Last-tick-time-API.patch similarity index 100% rename from patches/server/0061-Last-tick-time-API.patch rename to patches/server/0062-Last-tick-time-API.patch diff --git a/patches/server/0062-Show-last-tick-time-in-tps-command.patch b/patches/server/0063-Show-last-tick-time-in-tps-command.patch similarity index 100% rename from patches/server/0062-Show-last-tick-time-in-tps-command.patch rename to patches/server/0063-Show-last-tick-time-in-tps-command.patch diff --git a/patches/server/0063-Collision-physics-check-before-vehicle-check.patch b/patches/server/0064-Collision-physics-check-before-vehicle-check.patch similarity index 100% rename from patches/server/0063-Collision-physics-check-before-vehicle-check.patch rename to patches/server/0064-Collision-physics-check-before-vehicle-check.patch diff --git a/patches/server/0064-Variable-main-thread-task-delay.patch b/patches/server/0065-Variable-main-thread-task-delay.patch similarity index 100% rename from patches/server/0064-Variable-main-thread-task-delay.patch rename to patches/server/0065-Variable-main-thread-task-delay.patch diff --git a/patches/server/0065-Reduce-RandomSource-instances.patch b/patches/server/0066-Reduce-RandomSource-instances.patch similarity index 100% rename from patches/server/0065-Reduce-RandomSource-instances.patch rename to patches/server/0066-Reduce-RandomSource-instances.patch diff --git a/patches/server/0066-CPU-cores-estimation.patch b/patches/server/0067-CPU-cores-estimation.patch similarity index 100% rename from patches/server/0066-CPU-cores-estimation.patch rename to patches/server/0067-CPU-cores-estimation.patch diff --git a/patches/server/0067-Add-centralized-AsyncExecutor.patch b/patches/server/0068-Add-centralized-AsyncExecutor.patch similarity index 100% rename from patches/server/0067-Add-centralized-AsyncExecutor.patch rename to patches/server/0068-Add-centralized-AsyncExecutor.patch diff --git a/patches/server/0068-Remove-Paper-async-executor.patch b/patches/server/0069-Remove-Paper-async-executor.patch similarity index 100% rename from patches/server/0068-Remove-Paper-async-executor.patch rename to patches/server/0069-Remove-Paper-async-executor.patch diff --git a/patches/server/0069-Remove-Paper-cleaner-executor.patch b/patches/server/0070-Remove-Paper-cleaner-executor.patch similarity index 100% rename from patches/server/0069-Remove-Paper-cleaner-executor.patch rename to patches/server/0070-Remove-Paper-cleaner-executor.patch diff --git a/patches/server/0070-Remove-background-executor.patch b/patches/server/0071-Remove-background-executor.patch similarity index 100% rename from patches/server/0070-Remove-background-executor.patch rename to patches/server/0071-Remove-background-executor.patch diff --git a/patches/server/0071-Remove-bootstrap-executor.patch b/patches/server/0072-Remove-bootstrap-executor.patch similarity index 100% rename from patches/server/0071-Remove-bootstrap-executor.patch rename to patches/server/0072-Remove-bootstrap-executor.patch diff --git a/patches/server/0072-Remove-world-upgrade-executors.patch b/patches/server/0073-Remove-world-upgrade-executors.patch similarity index 100% rename from patches/server/0072-Remove-world-upgrade-executors.patch rename to patches/server/0073-Remove-world-upgrade-executors.patch diff --git a/patches/server/0073-Remove-tab-complete-executor.patch b/patches/server/0074-Remove-tab-complete-executor.patch similarity index 100% rename from patches/server/0073-Remove-tab-complete-executor.patch rename to patches/server/0074-Remove-tab-complete-executor.patch diff --git a/patches/server/0074-Remove-text-filter-executor.patch b/patches/server/0075-Remove-text-filter-executor.patch similarity index 100% rename from patches/server/0074-Remove-text-filter-executor.patch rename to patches/server/0075-Remove-text-filter-executor.patch