aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch')
-rw-r--r--patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch b/patches/server/0623-Add-option-to-fix-items-merging-through-walls.patch
new file mode 100644
index 0000000000..ca8770c5bd
--- /dev/null
+++ b/patches/server/0623-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 7678199278324cce4ce736197cb8766c134a0f87..8a2c135ee7c6fe60a2debf7a7b02fb9ffc3d2c2f 100644
+--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
++++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
+@@ -257,6 +257,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 = this.level().clip(rayTrace);
++ if (rayTraceResult.getType() == net.minecraft.world.phys.HitResult.Type.BLOCK) continue;
++ }
++ // Paper End
+ this.tryToMerge(entityitem);
+ if (this.isRemoved()) {
+ break;