Check for block type in SculkSensorBlock#canActivate

PaperMC · Aug 7, 2024 · 4e6a2a1 · 4e6a2a1
1 parent 042f15f
commit 4e6a2a1
Showing 1 changed file with 19 additions and 0 deletions.
diff --git a/patches/server/1046-Check-for-block-type-in-SculkSensorBlock-canActivate.patch b/patches/server/1046-Check-for-block-type-in-SculkSensorBlock-canActivate.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Nassim Jahnke <nassim@njahnke.dev>
+Date: Wed, 7 Aug 2024 14:33:25 +0200
+Subject: [PATCH] Check for block type in SculkSensorBlock#canActivate
+
+
+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 9e928302817ee8e1cc8c7f3f1b351a0d5f3a7c2c..1db261f63aaf083b4d38f519f77abecbd942e999 100644
+--- a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
++++ b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
+@@ -218,7 +218,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) {