1 files changed, 25 insertions, 0 deletions
diff --git a/patches/unapplied/server/0633-Add-option-to-fix-items-merging-through-walls.patch b/patches/unapplied/server/0633-Add-option-to-fix-items-merging-through-walls.patch
new file mode 100644
index 0000000000..8e31fc0547
--- /dev/null
+++ b/patches/unapplied/server/0633-Add-option-to-fix-items-merging-through-walls.patch
@@ -0,0 +1,25 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: GioSDA <[email protected]>
+Date: Wed, 10 Mar 2021 10:06:45 -0800
+Subject: [PATCH] Add option to fix items merging through walls
+
+
+diff --git a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+index 028fd9c7cb927cde84ee2d078681d122d7d928aa..d9d50c2658aa3db77948e051d068876d2f5042e6 100644
+--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+@@ -252,6 +252,14 @@ public class ItemEntity extends Entity implements TraceableEntity {
+                 ItemEntity entityitem = (ItemEntity) iterator.next();
+ 
+                 if (entityitem.isMergable()) {
++                    // Paper Start - Fix items merging through walls
++                        if (this.level.paperConfig().fixes.fixItemsMergingThroughWalls) {
++                            net.minecraft.world.level.ClipContext rayTrace = new net.minecraft.world.level.ClipContext(this.position(), entityitem.position(),
++                                net.minecraft.world.level.ClipContext.Block.COLLIDER, net.minecraft.world.level.ClipContext.Fluid.NONE, this);
++                            net.minecraft.world.phys.BlockHitResult rayTraceResult = level.clip(rayTrace);
++                            if (rayTraceResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
++                        }
++                    // Paper End
+                     this.tryToMerge(entityitem);
+                     if (this.isRemoved()) {
+                         break;