Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@3aec863 Add BlockLockCheckEvent (#7840)
PaperMC/Paper@0262de0 Deprecate TargetBlock/EntityInfo and assocated methods (#7381)
PaperMC/Paper@28c7d40 Add Sneaking API for Entities (#8485)
PaperMC/Paper@262c08f Updated Upstream (CraftBukkit) (#8680)
This commit is contained in:
BillyGalbreath
2022-12-16 10:40:50 -06:00
parent ed3d48efcf
commit 7062a32f8f
28 changed files with 65 additions and 65 deletions

View File

@@ -17,7 +17,7 @@ index 2fd89736091bda7005ef27e42a2aad0df27fa3b5..0034831358550491d57360966b1458b3
// CraftBukkit end
diff --git a/src/main/java/net/minecraft/world/level/block/SlabBlock.java b/src/main/java/net/minecraft/world/level/block/SlabBlock.java
index 18b603d646081926343dea108b55d641df1c2c34..fdbbd2e5d4fd970a4593b55f16bd0f82248e06b8 100644
index 18b603d646081926343dea108b55d641df1c2c34..03ad3e45fc6d48091ac0c0ba5dc3d014b1d4ddfa 100644
--- a/src/main/java/net/minecraft/world/level/block/SlabBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/SlabBlock.java
@@ -130,4 +130,25 @@ public class SlabBlock extends Block implements SimpleWaterloggedBlock {
@@ -30,7 +30,7 @@ index 18b603d646081926343dea108b55d641df1c2c34..fdbbd2e5d4fd970a4593b55f16bd0f82
+ if (state.getValue(SlabBlock.TYPE) != SlabType.DOUBLE) {
+ return false;
+ }
+ net.minecraft.world.phys.HitResult result = player.getRayTrace(16);
+ net.minecraft.world.phys.HitResult result = player.getRayTrace(16, net.minecraft.world.level.ClipContext.Fluid.NONE);
+ if (result.getType() != net.minecraft.world.phys.HitResult.Type.BLOCK) {
+ return false;
+ }