9
0
mirror of https://github.com/LeavesMC/Leaves.git synced 2025-12-19 14:59:32 +00:00
Files
LeavesMC/patches/server/0105-CCE-update-suppression.patch
2024-07-25 14:56:09 +08:00

37 lines
2.1 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/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
index 4a0617f7b5f528421620ad504467212b7042716f..bb82b7aadb03ffba652948a660773035f5ee735d 100644
--- a/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/ShulkerBoxBlock.java
@@ -231,17 +231,21 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
@Override
protected int getAnalogOutputSignal(BlockState state, Level world, BlockPos pos) {
- // Leaves start - fix update suppression crash
+ // Leaves start - fix update suppression crash - and cce fix
if (org.leavesmc.leaves.LeavesConfig.updateSuppressionCrashFix) {
try {
- return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos));
+ return org.leavesmc.leaves.LeavesConfig.cceUpdateSuppression ?
+ AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) world.getBlockEntity(pos)) :
+ AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos));
} catch (ClassCastException ex) {
throw new org.leavesmc.leaves.util.UpdateSuppressionException(null, pos);
}
} else {
- return AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos));
+ return org.leavesmc.leaves.LeavesConfig.cceUpdateSuppression ?
+ AbstractContainerMenu.getRedstoneSignalFromContainer((net.minecraft.world.Container) world.getBlockEntity(pos)) :
+ AbstractContainerMenu.getRedstoneSignalFromBlockEntity(world.getBlockEntity(pos));
}
- // Leaves end - fix update suppression crash
+ // Leaves end - fix update suppression crash - and cce fix
}
@Override