Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-28 03:48:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix fixItemsMergingThroughWalls check (#9707)

Browse Source
This commit is contained in:
violetc 2023-09-11 12:46:02 +08:00
parent 021d59363b
commit 19a5d6d225
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/Add-option-to-fix-items-merging-through-walls.patch
View File

@ -13,9 +13,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
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;
+ 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);