1 files changed, 39 insertions, 0 deletions
diff --git a/patches/server/0665-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0665-Add-option-to-fix-items-merging-through-walls.patch
new file mode 100644
index 0000000000..3855ef8543
--- /dev/null
+++ b/patches/server/0665-Add-option-to-fix-items-merging-through-walls.patch
@@ -0,0 +1,39 @@
+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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+index 489c81493ecae59c5d02572b447ed2696959c947..56d0c34446a962b46143a43a179b7c3307481296 100644
+--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
++++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
+@@ -828,4 +828,9 @@ public class PaperWorldConfig {
+     private void mapItemFrameCursorLimit() {
+         mapItemFrameCursorLimit = getInt("map-item-frame-cursor-limit", mapItemFrameCursorLimit);
+     }
++
++    public boolean fixItemsMergingThroughWalls;
++    private void fixItemsMergingThroughWalls() {
++        fixItemsMergingThroughWalls = getBoolean("fix-items-merging-through-walls", fixItemsMergingThroughWalls);
++    }
+ }
+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 7b2ac6920d5f0a8dc7cbb552a0e45e2fe471190e..47b946f7b761a318780b7c1973d0450faf7e8b62 100644
+--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+@@ -240,6 +240,14 @@ public class ItemEntity extends Entity {
+                 ItemEntity entityitem = (ItemEntity) iterator.next();
+ 
+                 if (entityitem.isMergable()) {
++                    // Paper Start - Fix items merging through walls
++                        if (this.level.paperConfig.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;