mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
30 lines
1.7 KiB
Diff
30 lines
1.7 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: violetc <58360096+s-yh-china@users.noreply.github.com>
|
|
Date: Thu, 28 Sep 2023 17:07:02 +0800
|
|
Subject: [PATCH] CCE update suppression
|
|
|
|
|
|
diff --git a/net/minecraft/world/level/block/ShulkerBoxBlock.java b/net/minecraft/world/level/block/ShulkerBoxBlock.java
|
|
index fef902077b69830b570d1adf86603f45b4f6a839..c34318fdc454ea31655c3c3aa5dbedd3d922ee24 100644
|
|
--- a/net/minecraft/world/level/block/ShulkerBoxBlock.java
|
|
+++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java
|
|
@@ -185,7 +185,9 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
|
|
protected int getAnalogOutputSignal(BlockState blockState, Level level, BlockPos pos) {
|
|
// Leaves start - fix update suppression crash
|
|
try {
|
|
- return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
|
|
+ return org.leavesmc.leaves.LeavesConfig.modify.oldMC.updater.cceUpdateSuppression ?
|
|
+ AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) level.getBlockEntity(pos)) : // Leaves - make cce happy(?)
|
|
+ AbstractContainerMenu.getRedstoneSignalFromBlockEntity(level.getBlockEntity(pos));
|
|
} catch (ClassCastException ex) {
|
|
if (org.leavesmc.leaves.LeavesConfig.modify.updateSuppressionCrashFix) {
|
|
throw new org.leavesmc.leaves.util.UpdateSuppressionException(pos, this);
|
|
@@ -193,7 +195,6 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
|
|
throw ex;
|
|
}
|
|
}
|
|
- // Leaves end - fix update suppression crash
|
|
}
|
|
|
|
public static Block getBlockByColor(@Nullable DyeColor color) {
|