From dc8c0bb0d760cf2ad1d393d1800d311129e07dc4 Mon Sep 17 00:00:00 2001 From: Samsuik Date: Sun, 11 Aug 2024 11:18:37 +0100 Subject: [PATCH] Backport upstream fixes --- ...block-type-in-SculkSensorBlock-canAc.patch | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 patches/server/0082-PAPER-Check-for-block-type-in-SculkSensorBlock-canAc.patch diff --git a/patches/server/0082-PAPER-Check-for-block-type-in-SculkSensorBlock-canAc.patch b/patches/server/0082-PAPER-Check-for-block-type-in-SculkSensorBlock-canAc.patch new file mode 100644 index 0000000..795a566 --- /dev/null +++ b/patches/server/0082-PAPER-Check-for-block-type-in-SculkSensorBlock-canAc.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Nassim Jahnke +Date: Wed, 7 Aug 2024 14:33:25 +0200 +Subject: [PATCH] PAPER - Check for block type in SculkSensorBlock#canActivate + +Backported https://github.com/PaperMC/Paper/commit/4e6a2a13a3e1f6fa1067a7821d2f018339395533 + +diff --git a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java +index cc67c6c0f439968c280ae484649c6c7ba934eec9..865c33c5a5aa58d87b89a40229ea34cb532d6ea7 100644 +--- a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java +@@ -217,7 +217,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg + } + + public static boolean canActivate(BlockState state) { +- return SculkSensorBlock.getPhase(state) == SculkSensorPhase.INACTIVE; ++ return state.getBlock() instanceof SculkSensorBlock && SculkSensorBlock.getPhase(state) == SculkSensorPhase.INACTIVE; // Paper - Check for a valid type + } + + public static void deactivate(Level world, BlockPos pos, BlockState state) {