From 4b761f97a3abc47a0569635854763dd7ab26a7e0 Mon Sep 17 00:00:00 2001 From: Newwind Date: Wed, 7 Aug 2024 13:25:55 +0200 Subject: [PATCH] Configuration for horizontal-only item merging Most of the visual artifacts that result from having item merge radius above vanilla levels is from items merging vertically, which realistically, only happens when a player is dropping items, or items are dropping from breaking a block. Most of the scenarios where item merging makes sense involves the two item entities being on the same Y level. i.e on the ground next to each other. This is even more apparent since paper fixed items being able to merge through blocks. This patch allows us to configure items to only merge horizontally, which is what vanilla does. This allows us to have both the reduced number of item entities a high item-merge radius provides, without most of the visual artifacts caused by items merging vertically. --- .../net/minecraft/world/entity/item/ItemEntity.java.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paper-server/patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch b/paper-server/patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch index 6a10c73943..5a90b965e8 100644 --- a/paper-server/patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch +++ b/paper-server/patches/sources/net/minecraft/world/entity/item/ItemEntity.java.patch @@ -183,7 +183,7 @@ - List list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(0.5D, 0.0D, 0.5D), (entityitem) -> { + // Spigot start + double radius = this.level().spigotConfig.itemMerge; -+ List list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, radius - 0.5D, radius), (entityitem) -> { ++ List list = this.level().getEntitiesOfClass(ItemEntity.class, this.getBoundingBox().inflate(radius, this.level().paperConfig().entities.behavior.onlyMergeItemsHorizontally ? 0 : radius - 0.5D, radius), (entityitem) -> { // Paper - configuration to only merge items horizontally + // Spigot end return entityitem != this && entityitem.isMergable(); });