mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-12 06:58:11 +02:00
24 lines
1.3 KiB
Diff
24 lines
1.3 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: GioSDA <gsdambrosio@gmail.com>
|
||
|
|
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 5d742d072d2cc532ce86bff3de15a5f0f381d1c5..3f479cdca77ad051a8fcf56e99c7811998a92f2a 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
@@ -258,6 +258,12 @@ 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().clipDirect(this.position(), entityitem.position(),
|
||
|
|
+ net.minecraft.world.phys.shapes.CollisionContext.of(this)) == net.minecraft.world.phys.HitResult.Type.BLOCK) {
|
||
|
|
+ continue;
|
||
|
|
+ }
|
||
|
|
+ // Paper end - Fix items merging through walls
|
||
|
|
this.tryToMerge(entityitem);
|
||
|
|
if (this.isRemoved()) {
|
||
|
|
break;
|