Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-12-16 11:30:06 +01:00
bffb08c2f9
The Paper method was chosen for deprecation because it was more restrictive in that it has an isGliding check.
26 Zeilen
1.4 KiB
Diff
26 Zeilen
1.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/net/minecraft/world/entity/item/ItemEntity.java b/src/main/java/net/minecraft/world/entity/item/ItemEntity.java
|
|
index a7eccb2f364ed633cb6d4914491eb686ff02e647..d70abca10e84b86310ce5e4d72eb939331dc00e4 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,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) {
|
|
+ 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;
|