Repo-Mirror/SakuraMC
9
0
Fork 0
mirror of https://github.com/Samsuik/Sakura.git synced 2025-12-30 20:29:14 +00:00
Code Issues Releases Activity

Backport upstream fixes

Browse Source
This commit is contained in:
Samsuik
2024-08-11 11:18:37 +01:00
parent 08c35df87f
commit dc8c0bb0d7
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/server/0082-PAPER-Check-for-block-type-in-SculkSensorBlock-canAc.patch Normal file
View File

@@ -0,0 +1,20 @@
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] 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) {