mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-04 01:39:54 +01:00
d5f1ffc2e6
With the new chunk system it doesn't hurt too much to (temporarily) remove this until implemented in a safer manner
26 lines
1.6 KiB
Diff
26 lines
1.6 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 1dc7f3963069313de6b969c44bdd21272483f7be..1f965e4428d627eaab69ace45486f1d14d2bb504 100644
|
|
--- a/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
+++ b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
@@ -243,6 +243,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().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;
|