Skip to content

Commit dc8c0bb

Browse files
committed
Backport upstream fixes
1 parent 08c35df commit dc8c0bb

File tree

1 file changed

+20
-0
lines changed

1 file changed

+20
-0
lines changed
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Nassim Jahnke <[email protected]>
3+
Date: Wed, 7 Aug 2024 14:33:25 +0200
4+
Subject: [PATCH] PAPER - Check for block type in SculkSensorBlock#canActivate
5+
6+
Backported https://github.com/PaperMC/Paper/commit/4e6a2a13a3e1f6fa1067a7821d2f018339395533
7+
8+
diff --git a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
9+
index cc67c6c0f439968c280ae484649c6c7ba934eec9..865c33c5a5aa58d87b89a40229ea34cb532d6ea7 100644
10+
--- a/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
11+
+++ b/src/main/java/net/minecraft/world/level/block/SculkSensorBlock.java
12+
@@ -217,7 +217,7 @@ public class SculkSensorBlock extends BaseEntityBlock implements SimpleWaterlogg
13+
}
14+
15+
public static boolean canActivate(BlockState state) {
16+
- return SculkSensorBlock.getPhase(state) == SculkSensorPhase.INACTIVE;
17+
+ return state.getBlock() instanceof SculkSensorBlock && SculkSensorBlock.getPhase(state) == SculkSensorPhase.INACTIVE; // Paper - Check for a valid type
18+
}
19+
20+
public static void deactivate(Level world, BlockPos pos, BlockState state) {

0 commit comments

Comments
 (0)