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 22321ab19af662c8f75620422c1775fe805356f3..075af07a5c0e8328fb411d22fd29cea9c2b07711 100644 --- a/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java +++ b/src/main/java/org/galemc/gale/configuration/GaleWorldConfiguration.java @@ -254,6 +254,11 @@ public class GaleWorldConfiguration extends ConfigurationPart { public boolean mc238526 = false; // Gale end - Purpur - fix MC-238526 + // Gale start - Purpur - fix MC-123848 + @Setting("mc-123848") + public boolean mc123848 = false; + // Gale end - Purpur - fix MC-123848 + } }