From b76064e57ae058c4d11228eb0e427c60f5c246d4 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 12 Nov 2024 09:32:47 -0800 Subject: [PATCH] Fixed missed call to getFriction hook in AbstractBoat --- .../world/entity/vehicle/AbstractBoat.java.patch | 9 +++++++++ .../net/minecraft/world/level/block/Block.java.patch | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch b/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch index 8803bcf225..76fb83c64e 100644 --- a/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch +++ b/patches/minecraft/net/minecraft/world/entity/vehicle/AbstractBoat.java.patch @@ -18,6 +18,15 @@ f = Math.max(f, fluidstate.getHeight(this.level(), blockpos$mutableblockpos)); } +@@ -522,7 +_,7 @@ + voxelshape, + BooleanOp.AND + )) { +- f += blockstate.getBlock().getFriction(); ++ f += blockstate.getFriction(this.level(), blockpos$mutableblockpos, this); + k1++; + } + } @@ -551,7 +_,7 @@ for (int i2 = i1; i2 < j1; i2++) { blockpos$mutableblockpos.set(k1, l1, i2); diff --git a/patches/minecraft/net/minecraft/world/level/block/Block.java.patch b/patches/minecraft/net/minecraft/world/level/block/Block.java.patch index 0b47838f31..81554ee531 100644 --- a/patches/minecraft/net/minecraft/world/level/block/Block.java.patch +++ b/patches/minecraft/net/minecraft/world/level/block/Block.java.patch @@ -91,7 +91,7 @@ } public void setPlacedBy(Level p_49847_, BlockPos p_49848_, BlockState p_49849_, @Nullable LivingEntity p_49850_, ItemStack p_49851_) { -@@ -375,6 +_,7 @@ +@@ -375,10 +_,12 @@ p_49822_.setDeltaMovement(p_49822_.getDeltaMovement().multiply(1.0, 0.0, 1.0)); } @@ -99,6 +99,11 @@ public ItemStack getCloneItemStack(LevelReader p_312699_, BlockPos p_49824_, BlockState p_49825_) { return new ItemStack(this); } + ++ /** @deprecated Forge use {@link IForgeStateBlock#getFriction(Level, BlockPos, Entity)}*/ + public float getFriction() { + return this.friction; + } @@ -449,7 +_,7 @@ this.item = Item.byBlock(this); }