40 lines
2.4 KiB
Diff
40 lines
2.4 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/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
index 9287dfcf29ce6f89a937f4e10b70be8faab9ab9e..74f2413773fbe30597314e02a5284172e0fc40b2 100644
|
||
|
|
--- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
|
||
|
|
@@ -821,4 +821,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 7476ae301fb4ee503944d39022cb25ccb19f1232..d937a74d2e822c8542286fb5bcdfcec7895d845c 100644
|
||
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
||
|
|
@@ -227,6 +227,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.removed) {
|
||
|
|
break;
|